LQE-154: removed rebudant code