Cleanup OSGi dependency declarations