HH-37783 move handler.py methods around