CONN-722:Remove commented code