Tidy up exccess comments