cleanup: removed adhoc debugging everywhere