BoardConfig: Clean up after merge