Revert "Fixed typos made by Eclipse refactoring operation. :-)"

This reverts commit 7d250080733a81db6d600f43fc81f2a0bd775a21.
Revert "Added 'OsgiService' annotation for making beans available as OSGi services."

This reverts commit 241517be69dc9927e937853097f6a6cfa67258ec.