fix up the clean up template