Clean up

A couple of calls to print and a bunch of unused template files are
being removed.