[KFSQA-1039] clean up