Cleanup from yesterday

Leaving it in a broken state, and for good reason (Requires MAJOR design
choice to proceed)