Repo cleanup to match to the .gitignore
clean up
merging cleanup changes