Clean up

Change-Id: I4f240465e5fa0383799307efc478d5df4db5adcc