KFSQA-791 clean up