Cleanup

Change-Id: Ib4ed12fe2d44838a228f4ed515852ed2f58b2218
Merge "Cleanup" into kk