Removed OSGi bundle
Removed redundant dependencies
Unified copyright statement style