Cleaning up and adding untracked files