change logic according to bug HHQ-5890 -- remove code