planning: Make it go away completely