Fixed build error due to removing osgi dependencies