Expand plan refactoring

Right, maybe fix the comment then and saying something like: "currently disabled" instead? Like it is confusing.