Cleanup

Change-Id: Ic861a269bfe77b3970cc85998c25ebc69d3ffdc9