Removed a load of old stuff