BoardConfig: cleanup

Change-Id: I2a524190519d5ca6c0acba9c9e63869e882e44ed
device_holiday: cleanup

Change-Id: Ibcde6c642ddcfd84cef72de46d4a3e755434b66a