remove CE2 specific methods & redo some of the comments that are
specific to CE2 into CE1 comments.