Cleanup

Change-Id: I1880a2650817b71edcc1254b433a92a30bea5dc4