Some cleanup

Change-Id: I1fb332dbc77d69feab1a33c064252efd3ccf32fc