removed more redundant handlers and templates