Work on wtable, pre cleanup.
Post wtable cleanup.