Cleaning up some graveyard comments