some clean up in handlers package