Files Tidy

Tidying files, removing unused comments and making sure everything
works before merging with Trunk branch