Moving more parameter logic into Rpc, remove Sidekiq