cleanup of pre-existing comments