more OSGi removal