Clean up comments in viewer template