Clean up some more old code