Removed stuff necessary for OSGi