Further cleanups of osgi imports.