Cleanup

Change-Id: I4a6d3d7db971f6eab1ed308529d13c91c84d9ee4