Code cleanup: removed unused imports, added suppression for unneccessary generics warnings, etc.