Clean handlers and templates