Removed some more old code.