Further clean up of files for push to github