ENYO-2727: edit comments and clean some dead code.