Cleanup

Change-Id: I3cfc9400cb8937c77f32e1864d813f5c50838bff