configs: mostly trivial clean-up