bit of clean-up and simplifying the plan hierarchy