Removing lots of inline debug output