removed a load of debug