Planning clean-up