#7: Cleaned up most dead code.
Merge branch 'feature/7-refactoring-clean-up-dead-code'