Removed deprectated classes.
Cleanup.
Comprehensive refactoring + cleanup.