KFSQA-864 clean up