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