TAP5-2358 : removing some debbuging code.