Remove fallback obsolete logic