Remove proprietary marketplace gateway
Fix unable to download instance handles due to dashboard_url