[KFSQA-854] clean up