more cleanup of hop_runner