Merge "Tidy up comments & remove commented out code."