Remove ActionHandler boilerplate