Cleaned up config and related calls.
More consolidation of configs