Cleaning up

Removed unnecessary files and clean up the code. Will merge and then we are ready to go from here.