Fix indirect import in webgateway

Remove unused import from gateway and fix indirect imports of that name

--rebased-from #2280