Eliminate lots of old code