few other config TODOs eliminated