#15 drop osgi-related modules