KFSQA-864 clean up to prepare a merge with master