Ongoing cleanup of old code.