Cleanup and support for destination_url parameter