* Refactor: cleaned up unused files

* Refactor: changing branches (need to commit)

* Refactor: refactored some code