Some clean-up.

Change-Id: I7e48b813b07708a8a24febcee28cb345dd438c5c