Cleaning up extra files and code