Removed unnecessary calls to configuration check/load