Remove a load of old code