diff --git a/build-tomcat-server/configuration/tomcat-server.xml b/build-tomcat-server/configuration/tomcat-server.xml
index 021df19..e2b68be 100644
--- a/build-tomcat-server/configuration/tomcat-server.xml
+++ b/build-tomcat-server/configuration/tomcat-server.xml
@@ -38,8 +38,8 @@
 
 		<Engine name="Catalina" defaultHost="localhost">
 			<Realm className="org.apache.catalina.realm.JAASRealm" appName="virgo-kernel"
-					userClassNames="org.eclipse.virgo.kernel.authentication.User"
-					roleClassNames="org.eclipse.virgo.kernel.authentication.Role"/>
+					userClassNames="org.eclipse.virgo.nano.authentication.User"
+					roleClassNames="org.eclipse.virgo.nano.authentication.Role"/>
 
 			<Host name="localhost"  appBase=""
 					unpackWARs="false" autoDeploy="false"
diff --git a/build.versions b/build.versions
index 58715f8..a597e4f 100644
--- a/build.versions
+++ b/build.versions
@@ -1,4 +1,3 @@
-org.eclipse.virgo.osgi=3.6.0.D-20120711092707
 org.eclipse.virgo.medic=3.6.0.D-20120717201225
 org.eclipse.virgo.kernel=3.6.0.D-20120727123513
 org.eclipse.virgo.repository=3.6.0.D-20120717202028
diff --git a/scripts/virgoise.sh b/scripts/virgoise.sh
deleted file mode 100755
index a0fee10..0000000
--- a/scripts/virgoise.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-dir=`dirname $0`
-dir=`cd $dir;pwd`
-
-for f in $(find . -iname "*.java" -or -iname "*.aj" -or -iname "*.xml" -or -iname ".project" -or -iname "*.MF" -or -iname "*.mf" -or -iname ".prefs"  -or -iname ".classpath" -or -iname "build.versions" -or -iname "*.properties" -or -iname "*.bat" -or -iname "*.sh" -or -iname "*.conf" -or -iname "*.profile" -or -iname "*.config" -or -iname "*.plan" -or -iname "runner.bundles")
-do
-	
-sed -i -e 's/com\.springsource\.osgi\.teststubs/org.eclipse.virgo.teststubs.osgi/g' $f
-sed -i -e 's/com\.springsource\.osgi\.stub/org.eclipse.virgo.teststubs.osgi/g' $f
-sed -i -e 's/OSGI_TEST_STUBS_IVY_CACHE/TEST_STUBS_IVY_CACHE/g' $f
-
-sed -i -e 's/com\.springsource\.osgi\.test\.stubs/org.eclipse.virgo.teststubs.osgi/g' $f
-sed -i -e 's/com\.springsource\.osgi\.extensions/org.eclipse.virgo.osgi.extensions/g' $f
-sed -i -e 's/com\.springsource\.osgi\.launcher/org.eclipse.virgo.osgi.launcher/g' $f
-
-sed -i -e 's/com\.springsource\.util/org.eclipse.virgo.util/g' $f
-
-sed -i -e 's/com\.springsource\.osgi\.test/org.eclipse.virgo.test/g' $f
-
-sed -i -e 's/com\.springsource\.osgi\.medic/org.eclipse.virgo.medic/g' $f
-sed -i -e 's/com\.springsource\.ch\.qos\.logback\.classic\.woven/org.eclipse.virgo.ch.qos.logback.classic.woven/g' $f
-
-sed -i -e 's/com\.springsource\.repository/org.eclipse.virgo.repository/g' $f
-
-sed -i -e 's/com\.springsource\.osgi/org.eclipse.virgo.osgi/g' $f
-
-sed -i -e 's/com\.springsource\.kernel/org.eclipse.virgo.kernel/g' $f
-
-sed -i -e 's/com\/springsource\/kernel/org\/eclipse\/virgo\/kernel/g' $f
-
-sed -i -e 's/org\.eclipse\.virgo\.osgi\.test/org.eclipse.virgo.test/g' $f
-
-sed -i -e 's/com\.springsource\.osgi\.webcontainer/org.eclipse.gemini.web/g' $f
-
-sed -i -e 's/org\.eclipse\.virgo\.osgi\.webcontainer/org.eclipse.gemini.web/g' $f
-
-rm $f-e
-done
-
-$dir/update-dependency.rb -v org.eclipse.virgo.teststubs -n 1.0.0.D-20100311162851
-$dir/update-dependency.rb -v org.eclipse.virgo.osgi -n 2.1.0.D-20100311163103
-$dir/update-dependency.rb -v org.eclipse.virgo.util -n 2.1.0.D-20100311163244
-$dir/update-dependency.rb -v org.eclipse.virgo.test -n 2.1.0.D-20100311163545
-$dir/update-dependency.rb -v org.eclipse.virgo.medic -n 1.0.1.D-20100311163649
-$dir/update-dependency.rb -v org.eclipse.virgo.repository -n 2.1.0.D-20100311164021
-$dir/update-dependency.rb -v org.eclipse.virgo.kernel -n 2.1.0.D-20100311164357
-$dir/update-dependency.rb -v org.eclipse.gemini.web -n 1.0.0.BUILD-20100312113743
-
-
-