Removing some files and cleaning up the code