Deleting some unused template files.
Minor code tidyup for presentation.