Cleanup

Change-Id: I67b8ded05f0ce6b92d867218361514d3da9a652a