jf: clean up and consolidate defconfigs
* regenerate commonized defconfig
* clean up the mess