Cleanup on routes, templates