Cleanup

Change-Id: I067ca82217d9378865eca0040dd7f879cfd3ae63