clean up

Change-Id: Ica717db304df541f3c74a6e7dabae59bfd687504