Remove old code, make some things simpler.