More cleanup

Change-Id: Iffb930d9b1cca7e80ee133e648f4af5a54f88efa