Clearing the stage so that the rewrite can begin

Yak shaving? A little.