board: Clean-Up