KFSQA-631 removed commented useless code