Misc 3.1 compat changes

Removed nested_urls check, its the only supported mode now