Removed dependency on settings_local (for now)