[FELIX-5390] general clean up of code - remove unused imports - fix generic declaration issues - remove dead code