questions new template cleanup