Remove NetworkSupport and remove URI from HTTP API