Added missing component to plugin.xml
Removed unused imports
Remove unused imports, added missing annotations
Merge pull request #367 from dlsniper/cleanup

Cleanup source code of unused imports and missing annotations (also fixes #365)