shuttle-v2: cleanup