Code cleanup!

- removed any commented out code that is no longer needed
- cleaned up imports and unused variables
- various cleanups