Removing lower level debugging and adding higher level debugging