Small clean up

Change-Id: I50643eda53bac62db9afa4b33b305b1b7207e945