Cleaned up some of the files which were added back as part of the pull rebase from master