Yet another code clean up

- Changed Hash Map/Sets to Enum Map/Sets where appropriate
- Removed all unused imports
- Updated code for API changes
- More...
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>