New templates
Removed cruft files