cleanup [KFSQA-739]