Cleanup

Change-Id: I95c5ccff896ea16580bfd9274a3f4268ed9df277