KFSQA-791 some clean up for master merge