maguro: cleanup

Change-Id: Id20881e3acb7809c6bd7941a5d521f878e1ad867