Cleanup

Change-Id: Ia5d3b3fdbf0c6feaf2250b9b85c8a0009bafd61e