Cleanup

Change-Id: I626b7ae23fea7501f217f223f0c13d7fe0c813ac