some cleanup for hydra's sake