cleaning house with new template