KFSQA-973 cleanup