Cleanup

Change-Id: I047da337cf5529687dccce2d860eb5ed7ed6210d