scala version
OSGi cleanup, dropped java code
Minor code cleanups