cleanup some debugging in common