Cleanup cruft. Start wiring things up