Cleanup

Change-Id: Ibabdbd4ea60e9e08a29936f74a89e4fa889a65c9