Cleaning up the config related stuff for Service Layer Expansion