Clean up a little.

Change-Id: I0014cc8af22e4f2284d8e72b6b79fa300ad89028