Started cleanup configuration

Better align config with TS services