Cleanup of BoardConfig

Change-Id: I5097dcdc696f29c27272c612248643feea43021c