Clean up templates and transitions