REFACTOR: Cleanup

- Removed obsolete classes
- Removed trailing spaces
- Removed redundant newlines