Remove keypair not needed on rpc & rename templates