Cleaned the templates