Cleanup

Removed unused files from the project and removed some commented out
code that wasn't going to be used