[KFSQA-985] clean up