A little cleanup

Change-Id: I6a06f4a2a197d640fa31b2c21bc751214c630c3c