Removed a bunch of legacy code which slipped into the repo.