Misc Cleanup

Removing template files