Removed OSGi specific parts