QAART-381 Fixes from CR removed unnessary method