removes old comments
merge dave's and jason's changes