Updating templates and removing cruft from earlier project.