Cleanup and support for destination_url parameter

Should this be reverted?