Cleanup

Change-Id: I90ce610fac368a1665e182e1c7fce61f8cc484c3