add back config options and see if we can keep booting
more config changes
remove BFA, won't build
remove some stuff
remove some stuff
remove more stuff