Clean up

Change-Id: If13de87419260bd5719dda3a9a6aa0ca9ee9564c