Tidy up: Removed obsolete comments