Cleanup Annotation, Unused Imports and Variables