m8: some cleanup

Change-Id: Ibeb34aefd00b371e74ee3f547a162d0c9aa0bc21