board: Clean-up

Revert if you don't like it