Improved RPC clean-up process.