minor cleanup

Change-Id: Ia5f00d919f7d56254a03f826e1877b9a93e9804d