removing most OSGi references