Remove some unnecessary rpc commands and protocol messages