Clean up

Change-Id: If26ad08a30592df89ea45c93f8c670c509ec060e