BoardConfig: cleanup

Change-Id: I5357363a0328bcde7ddbc3bc2ff539ed084ab0d6