Clean up RPC messages from Main