Cleaning up

Change-Id: Ia3762ce6fe4836c754ee6179a67dcd5cb21a18f3