Removed old unnecessary test for some handlers. May be introduced later at 01. Removed some extra debug at otemplate.