Removing unused files - tweaking comments