m7: board cleanup