Revert "BoardConfig: Optmizations"

This reverts commit 47467029f29df5e582fa031d76c0a51dd77296a2.