Revert "more config tweaks"

This reverts commit bb32f3ad5749364272955d279b75e36b3ad63d80.
Revert "config update"

This reverts commit acd93b13de16b2c0caf0a72dfee77de4d830648b.
Revert "this is just FRANDOM"

This reverts commit 763a9c019e44bb9a28deec201862756fbad5028d.
fix a few patch fails and clean up from storm of commits