KFSQA-865 clean up for review