Cleanup

Change-Id: I8aec25168b1be0597b10ebde12846c0f81670699