remove out of date comments; tidy up