[BEP-1198] Remove debug code