ENH: remove debugging support statements + checks