Cleanup

Change-Id: I0b710a4602332436e2be8296d12b596c5caebc45