Drop last RPC request interruption + drop useless code.