diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-java b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-java
index a39bf608..2df321ed 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-java
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-java
@@ -1,16 +1,11 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CB1)!=#
-glassfish-xmlrpc-api
-#in#
-
 #?in(os_linux_pkglist, CB2)!=#
 sbt-bin
 #in#
 
 #?in(os_linux_pkglist, CB4)!=#
 #-world(#-cl_pass_file-#)-#
-!!glassfish-xmlrpc-api:0
 !!jython:2.7
 !!sbt-bin:0
 
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/www-servers b/profiles/templates/3.5/6_ac_update_sync/world/grp/www-servers
index 8b1faec4..3a15c9af 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/www-servers
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/www-servers
@@ -2,9 +2,14 @@
 
 #?in(os_linux_pkglist, CB1)!=#
 #-world(#-cl_pass_file-#)-#
+!!tomcat:0
 !!tornado:0
 #in#
 
 #?in(os_linux_pkglist, CB3)!=#
 tornado
 #in#
+
+#?in(os_linux_pkglist, CB4)!=#
+tomcat
+#in#