Some cleanup

Change-Id: I1abdb1d69b35f8aeedfce6059872f3cb7d57d5a2