Cleanups for previous changes

Change-Id: I68b72f8162f649de6b24b1b8982b7a80959a6ad5