[TIMOB-11869] Small fixes. Removed debug code.