Removed references to old fallback