Cleanup: delete whole bunch of old things for now