More cleanup

Change-Id: Ic60b4f611662a00eee40e13b7defdecb2b87abcf
1 file changed