Removed remaining refs to ConfigManager