- Removing unused debugging features.

- Refactoring Controller.py to use more static and class methods