Better cleanup now that we exclude some bytes in debug printing buffer