remove deprecated code and fix OSGi tests