Cleanup I missed

Change-Id: I33756bd5a44dff60c0650ffc8f66ab029df1888d