Remove extension calls that cause infinite recursion