Changes to reflect new source code

Removed overriding of default config location