More cleanup

Change-Id: If5c0d4269ff8ba2ca12c37d06257169225f908d9