More cleaning up and removing of unnecessary files for commit