BoardConfig cleanup

Change-Id: Icd8201b0a05bdbe4be2d704851f05599b93bf5a8