KFSQA-865 cleanup for review