Remove references to kws

Change-Id: I230d0178f0277fe0677bc65c44058544a04ee2af