really fixing cleanup_url