removed web/rpc separation again