diff --git a/common/common.properties b/common/common.properties
index cf51494..3043e3b 100644
--- a/common/common.properties
+++ b/common/common.properties
@@ -160,14 +160,6 @@
 merge.existing.headers=true
 fail.on.warnings=true
 
-# OSGi Properties
-org.springframework.build.osgi.version=1.0.0.RELEASE
-org.eclipse.osgi.version=3.5.0.v20090311-1300
-
-# S3 Properties
-accessKey=
-secretKey=
-
 # Eclipse key file location
 key.file=${user.home}/.ssh/id_rsa
 passphrase=
diff --git a/common/quality.xml b/common/quality.xml
index 9852041..8d8bb23 100644
--- a/common/quality.xml
+++ b/common/quality.xml
@@ -20,22 +20,6 @@
 
 	<target name="findbugs" depends="findbugs.pre, findbugs.do" description="Checks all code from the source tree for bugs."/>
 
-	<target name="osgi-validate" depends="ivy.init, osgi.init" description="Validates that a bundle can resolve against it's dependencies.">
-		<ivy:cachepath resolveId="osgi.optional.classpath" pathid="osgi.optional.classpath"
-				conf="compile,optional,provided,server-provided" type="jar" log="download-only"/>
-		<osgi:validate bundlePath="${jar.output.file}">
-			<equinoxPath refid="equinox.classpath"/>
-			<supportingBundlesPath refid="osgi.optional.classpath"/>
-		</osgi:validate>
-
-		<ivy:cachepath resolveId="osgi.compile.classpath" pathid="osgi.compile.classpath"
-				conf="compile,provided,server-provided" type="jar" log="download-only"/>
-		<osgi:validate bundlePath="${jar.output.file}">
-			<equinoxPath refid="equinox.classpath"/>
-			<supportingBundlesPath refid="osgi.compile.classpath"/>
-		</osgi:validate>
-	</target>
-
 	<target name="report" depends="ivy.init, resolve" description="Produce a HTML formatted report about all the dependencies and sub-dependencies of this build">
 		<mkdir dir="${ivy.report.todir}" />
 		<ivy:report conf="test, runtime, optional, provided, server-provided, aspects, external, additional" graph="false" xml="true"/>
@@ -213,18 +197,6 @@
 		<fail if="findbugs.warnings" message="FindBugs warnings found"/>
 	</target>
 
-	<target name="osgi.init" depends="ivy.init">
-		<ivy:cachepath resolveId="equinox.classpath" pathid="equinox.classpath" organisation="org.eclipse.osgi"
-			module="org.eclipse.osgi" revision="${org.eclipse.osgi.version}" type="jar" inline="true"
-			log="download-only"/>
-		<ivy:cachepath resolveId="ant.osgi.classpath" pathid="ant.osgi.classpath"
-				organisation="org.springframework.build" module="org.springframework.build.osgi"
-				revision="${org.springframework.build.osgi.version}" conf="runtime" type="jar" inline="true"
-				log="download-only"/>
-		<taskdef resource="org/springframework/build/osgi/antlib.xml" uri="antlib:org.springframework.build.osgi"
-			classpathref="ant.osgi.classpath"/>
-	</target>
-
 <!-- Macros -->
 	<macrodef name="test-run">
 		<attribute name="classpath.id"/>
diff --git a/war/quality.xml b/war/quality.xml
index 76d0938..08cbac5 100644
--- a/war/quality.xml
+++ b/war/quality.xml
@@ -16,23 +16,6 @@
 	<import file="common.xml"/>
 	<import file="../common/quality.xml"/>
 
-	<target name="osgi-validate" depends="ivy.init, osgi.init"
-			description="Validates that a bundle can resolve against it's dependencies.">
-		<ivy:cachepath resolveId="osgi.optional.classpath" pathid="osgi.optional.classpath"
-				conf="compile,optional,provided,server-provided" type="jar" log="download-only"/>
-		<osgi:validate bundlePath="${war.output.file}">
-			<equinoxPath refid="equinox.classpath"/>
-			<supportingBundlesPath refid="osgi.optional.classpath"/>
-		</osgi:validate>
-
-		<ivy:cachepath resolveId="osgi.compile.classpath" pathid="osgi.compile.classpath"
-				conf="compile,provided,server-provided" type="jar" log="download-only"/>
-		<osgi:validate bundlePath="${war.output.file}">
-			<equinoxPath refid="equinox.classpath"/>
-			<supportingBundlesPath refid="osgi.compile.classpath"/>
-		</osgi:validate>
-	</target>
-
 <!-- Other targets -->
 	<target name="test.do" depends="ivy.init, resolve.test, compile.init, test.init" if="test.exists">
 		<path id="test.compile.classpath">