cleanup and add new template