Remove OSGi for now