Remove references to unit_handler.