- Cleaning up temp comment code. Refs #22