Expand plan refactoring

Do we really need this since it doesn't work?