clean up templates
clean up models