#10 A new refactor plan.
removenent