clean-up + forks from Team Hydra