Cleanup

Change-Id: Icee04b849e1784d67c8c51a2b763aca55ab50d08