Remove unnecessary rpc requests by watch, and clean up codes