[OS-BUILD PATCHv11 0/0] all: cleanup a bunch of configs