Cleanup

Change-Id: I5757f264559a4d06af3bb2b9a48d693072f56ded