Board Clean-up and FB/etc configs update