board-m2.c : cleanup merge derps