Removed some more old stuff...