Removed KWS/KMF references

Change-Id: I1ed33c95b465dd99c1582d08c5c615a6d9c8a6a6