diff --git a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
index a6aba59e9fa4f222ec2414338e0b5a8b1db6b3f8..9e7b2bfd9296422103bc3e499ec2e9d2374d8980 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
@@ -8,13 +8,13 @@ import javax.servlet.http.HttpServletRequest
 
 import net.liftweb.json.JsonAST.JValue
 
+import scala.xml.Node
+
 import spark.deploy.{RequestWorkerState, JsonProtocol, WorkerState}
 import spark.deploy.worker.ExecutorRunner
 import spark.Utils
 import spark.ui.UIUtils
 
-import xml.Node
-
 class IndexPage(parent: WorkerWebUI) {
   val worker = parent.worker
   val timeout = parent.timeout
diff --git a/core/src/main/scala/spark/ui/JettyUtils.scala b/core/src/main/scala/spark/ui/JettyUtils.scala
index 93e7129fc013b7e0a9e5c085a79b778be8276c37..726a95594b7483fa79a7f469c7640a4d774ed3e3 100644
--- a/core/src/main/scala/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/spark/ui/JettyUtils.scala
@@ -10,11 +10,10 @@ import org.eclipse.jetty.server.{Server, Request, Handler}
 import org.eclipse.jetty.server.handler.{ResourceHandler, HandlerList, ContextHandler, AbstractHandler}
 
 import scala.util.{Try, Success, Failure}
+import scala.xml.Node
 
 import spark.Logging
 
-import xml.Node
-
 /** Utilities for launching a web server using Jetty's HTTP Server class */
 private[spark] object JettyUtils extends Logging {
   // Base type for a function that returns something based on an HTTP request. Allows for
diff --git a/core/src/main/scala/spark/ui/jobs/IndexPage.scala b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
index 8ebde7a37965a15e79bc42a9462728aa891c3ce6..87f3abc6b043fd218f8233acd5bbb1d6f2cb29f6 100644
--- a/core/src/main/scala/spark/ui/jobs/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/jobs/IndexPage.scala
@@ -7,13 +7,12 @@ import java.util.Date
 import javax.servlet.http.HttpServletRequest
 
 import scala.Some
+import scala.xml.{NodeSeq, Node}
 
 import spark.scheduler.Stage
 import spark.ui.UIUtils._
 import spark.storage.StorageLevel
 
-import xml.{NodeSeq, Node}
-
 /** Page showing list of all ongoing and recently finished stages */
 class IndexPage(parent: JobProgressUI) {
   val listener = parent.listener
diff --git a/core/src/main/scala/spark/ui/jobs/StagePage.scala b/core/src/main/scala/spark/ui/jobs/StagePage.scala
index 3c23a86d12cd31708c70a705e04fcee1820e6225..d76c07e458d5afe11d57cab2138cc45d42a58eb4 100644
--- a/core/src/main/scala/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/spark/ui/jobs/StagePage.scala
@@ -4,13 +4,13 @@ import java.util.Date
 
 import javax.servlet.http.HttpServletRequest
 
+import scala.xml.Node
+
 import spark.ui.UIUtils._
 import spark.util.Distribution
 import spark.scheduler.cluster.TaskInfo
 import spark.executor.TaskMetrics
 
-import xml.Node
-
 /** Page showing statistics and task list for a given stage */
 class StagePage(parent: JobProgressUI) {
   val listener = parent.listener
diff --git a/core/src/main/scala/spark/ui/storage/IndexPage.scala b/core/src/main/scala/spark/ui/storage/IndexPage.scala
index 1f9953fb6b78710774fcd9aaa60167a7c01f17c0..52b908709927aa82cf7f435282aaaf30c824f067 100644
--- a/core/src/main/scala/spark/ui/storage/IndexPage.scala
+++ b/core/src/main/scala/spark/ui/storage/IndexPage.scala
@@ -2,12 +2,12 @@ package spark.ui.storage
 
 import javax.servlet.http.HttpServletRequest
 
+import scala.xml.Node
+
 import spark.storage.{RDDInfo, StorageUtils}
 import spark.Utils
 import spark.ui.UIUtils._
 
-import xml.Node
-
 /** Page showing list of RDD's currently stored in the cluster */
 class IndexPage(parent: BlockManagerUI) {
   val sc = parent.sc
diff --git a/core/src/main/scala/spark/ui/storage/RDDPage.scala b/core/src/main/scala/spark/ui/storage/RDDPage.scala
index 466f4643bc51332e7aaf92e9ff9044133546f270..1031b2e17f05269ce403cc2819f23d13871317ba 100644
--- a/core/src/main/scala/spark/ui/storage/RDDPage.scala
+++ b/core/src/main/scala/spark/ui/storage/RDDPage.scala
@@ -2,13 +2,13 @@ package spark.ui.storage
 
 import javax.servlet.http.HttpServletRequest
 
+import scala.xml.Node
+
 import spark.storage.{StorageStatus, StorageUtils}
 import spark.ui.UIUtils._
 import spark.Utils
 import spark.storage.BlockManagerMasterActor.BlockStatus
 
-import xml.Node
-
 /** Page showing storage details for a given RDD */
 class RDDPage(parent: BlockManagerUI) {
   val sc = parent.sc