Cleanup

Change-Id: Ifd3dc5bd660097b7c3398288ed4e32af733dca3a