Clean up and plan support