[KFSQA-882] some clean up