Updated untracked files
More cleanup