update to templates
cleanup