remove a load of old logging code