General cleanup

* Removed some unused files/simple refactoring