Remove obsolete helper functions.

Minor edits to comments.