diff --git a/java-serverhost/pom.xml b/java-serverhost/pom.xml
index da2c486..0403048 100644
--- a/java-serverhost/pom.xml
+++ b/java-serverhost/pom.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.redhat.training.example</groupId>
   <artifactId>java-serverhost</artifactId>
@@ -8,36 +6,20 @@
   <version>1.0</version>
   <packaging>war</packaging>
 
-
   <properties>
-    <!-- Explicitly declaring the source encoding eliminates the following
-      message: -->
-    <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-      resources, i.e. build is platform dependent! -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <failOnMissingWebXml>false</failOnMissingWebXml>
-
-    <!-- Thorntail dependency versions -->
-    <version.thorntail>2.4.0.Final</version.thorntail>
-
-    <!-- other plugin versions -->
-    <version.compiler.plugin>3.1</version.compiler.plugin>
-    <version.surefire.plugin>2.16</version.surefire.plugin>
-    <version.war.plugin>2.5</version.war.plugin>
-
-    <!-- maven-compiler-plugin -->
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <version.wildfly.swarm>2.1.0.Final</version.wildfly.swarm>
     <maven.compiler.source>1.8</maven.compiler.source>
-
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <failOnMissingWebXml>false</failOnMissingWebXml>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>io.thorntail</groupId>
         <artifactId>bom-all</artifactId>
-        <version>${version.thorntail}</version>
+        <version>${version.wildfly.swarm}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -50,7 +32,7 @@
       <plugin>
         <groupId>io.thorntail</groupId>
         <artifactId>thorntail-maven-plugin</artifactId>
-        <version>${version.thorntail}</version>
+        <version>${version.wildfly.swarm}</version>
         
         <executions>
           <execution>
@@ -64,14 +46,6 @@
   </build>
 
   <dependencies>
-		<dependency>
-			<groupId>io.thorntail</groupId>
-			<artifactId>cdi</artifactId>
-		</dependency>
-    <dependency>
-      <groupId>io.thorntail</groupId>
-      <artifactId>jaxrs</artifactId>
-    </dependency>
     <!-- Java EE 7 dependency -->
     <dependency>
       <groupId>javax</groupId>
@@ -82,4 +56,4 @@
     <!-- WildFly Swarm Fractions -->
     
   </dependencies>
-</project>
+</project>
\ No newline at end of file