OSGi cleanup, dropped java code