cleaned up all the templates