[MAT-462] Fixups to comments and removal of a useless template.

Removes a template that added no value and fixes some comments.