Cleanup and reenable RPC in indexer