CON-2252 | Remove debug code