That's what's planned for the next stage. Dean rewrite is happening on the Patreon side currently and once that's done a lot of things are being culled for expediency.
