Cleanup lots of old crud