clean up and new template