[BACKLOG-195] Fixing broken build - missing imports for annotation

+import cleanup
+removing unused methods