clean up debug logging per @sprater review