Cleanup OSGI branch-- break initial example