Cleanup

Change-Id: I2d1dbb574259c588090e341640beb2589fc5fc70