diff --git a/funding/manager.go b/funding/manager.go
index c67aae461..e6b209f51 100644
--- a/funding/manager.go
+++ b/funding/manager.go
@@ -299,8 +299,6 @@ type InitFundingMsg struct {
 	// channel that will be useful to our future selves.
 	Memo []byte
 
-	CustomChannelData []byte
-
 	// Updates is a channel which updates to the opening status of the
 	// channel are sent on.
 	Updates chan *lnrpc.OpenStatusUpdate
@@ -4724,7 +4722,6 @@ func (f *Manager) handleInitFundingMsg(msg *InitFundingMsg) {
 		ScidAliasFeature:  scidFeatureVal,
 		Memo:              msg.Memo,
 		TapscriptRoot:     tapscriptRoot,
-		CustomChannelData: msg.CustomChannelData,
 	}
 
 	reservation, err := f.cfg.Wallet.InitChannelReservation(req)
diff --git a/lnrpc/lightning.pb.go b/lnrpc/lightning.pb.go
index e01414083..450e93e47 100644
--- a/lnrpc/lightning.pb.go
+++ b/lnrpc/lightning.pb.go
@@ -4684,8 +4684,7 @@ type Channel struct {
 	// An optional note-to-self to go along with the channel containing some
 	// useful information. This is only ever stored locally and in no way impacts
 	// the channel's operation.
-	Memo              string `protobuf:"bytes,36,opt,name=memo,proto3" json:"memo,omitempty"`
-	CustomChannelData []byte `protobuf:"bytes,37,opt,name=custom_channel_data,json=customChannelData,proto3" json:"custom_channel_data,omitempty"`
+	Memo string `protobuf:"bytes,36,opt,name=memo,proto3" json:"memo,omitempty"`
 }
 
 func (x *Channel) Reset() {
@@ -4976,13 +4975,6 @@ func (x *Channel) GetMemo() string {
 	return ""
 }
 
-func (x *Channel) GetCustomChannelData() []byte {
-	if x != nil {
-		return x.CustomChannelData
-	}
-	return nil
-}
-
 type ListChannelsRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -18447,7 +18439,7 @@ var file_lightning_proto_rawDesc = []byte{
 	0x73, 0x61, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x70,
 	0x74, 0x65, 0x64, 0x5f, 0x68, 0x74, 0x6c, 0x63, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52,
 	0x10, 0x6d, 0x61, 0x78, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x48, 0x74, 0x6c, 0x63,
-	0x73, 0x22, 0xdd, 0x0b, 0x0a, 0x07, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x16, 0x0a,
+	0x73, 0x22, 0xad, 0x0b, 0x0a, 0x07, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x16, 0x0a,
 	0x06, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x61,
 	0x63, 0x74, 0x69, 0x76, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x5f,
 	0x70, 0x75, 0x62, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65,
@@ -18538,10 +18530,7 @@ var file_lightning_proto_rawDesc = []byte{
 	0x6c, 0x69, 0x61, 0x73, 0x18, 0x23, 0x20, 0x01, 0x28, 0x04, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0d,
 	0x70, 0x65, 0x65, 0x72, 0x53, 0x63, 0x69, 0x64, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x12, 0x12, 0x0a,
 	0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x24, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d,
-	0x6f, 0x12, 0x2e, 0x0a, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x68, 0x61, 0x6e,
-	0x6e, 0x65, 0x6c, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x11,
-	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x44, 0x61, 0x74,
-	0x61, 0x22, 0xdf, 0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65,
+	0x6f, 0x22, 0xdf, 0x01, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65,
 	0x6c, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x63, 0x74,
 	0x69, 0x76, 0x65, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a,
 	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e,
diff --git a/lnrpc/lightning.proto b/lnrpc/lightning.proto
index a65b81624..29815d25e 100644
--- a/lnrpc/lightning.proto
+++ b/lnrpc/lightning.proto
@@ -1590,8 +1590,6 @@ message Channel {
     the channel's operation.
     */
     string memo = 36;
-
-    bytes custom_channel_data = 37;
 }
 
 message ListChannelsRequest {
diff --git a/lnrpc/lightning.swagger.json b/lnrpc/lightning.swagger.json
index e8120062f..02f6ad28e 100644
--- a/lnrpc/lightning.swagger.json
+++ b/lnrpc/lightning.swagger.json
@@ -3809,10 +3809,6 @@
         "memo": {
           "type": "string",
           "description": "An optional note-to-self to go along with the channel containing some\nuseful information. This is only ever stored locally and in no way impacts\nthe channel's operation."
-        },
-        "custom_channel_data": {
-          "type": "string",
-          "format": "byte"
         }
       }
     },
diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go
index 864d692ae..c94a02af8 100644
--- a/lnrpc/routerrpc/router.pb.go
+++ b/lnrpc/routerrpc/router.pb.go
@@ -3199,8 +3199,10 @@ type ForwardHtlcInterceptResponse struct {
 	//
 	// For backwards-compatibility reasons, TEMPORARY_CHANNEL_FAILURE is the
 	// default value for this field.
-	FailureCode        lnrpc.Failure_FailureCode `protobuf:"varint,5,opt,name=failure_code,json=failureCode,proto3,enum=lnrpc.Failure_FailureCode" json:"failure_code,omitempty"`
-	IncomingAmountMsat uint64                    `protobuf:"varint,6,opt,name=incoming_amount_msat,json=incomingAmountMsat,proto3" json:"incoming_amount_msat,omitempty"`
+	FailureCode lnrpc.Failure_FailureCode `protobuf:"varint,5,opt,name=failure_code,json=failureCode,proto3,enum=lnrpc.Failure_FailureCode" json:"failure_code,omitempty"`
+	// incoming_amount_msat is used to set the p2p message incoming amount field
+	// for validating an incoming HTLC.
+	IncomingAmountMsat uint64 `protobuf:"varint,6,opt,name=incoming_amount_msat,json=incomingAmountMsat,proto3" json:"incoming_amount_msat,omitempty"`
 	// outgoing_amount_msat is used to set the p2p message outgoing amount field
 	// for resuming a HTLC.
 	OutgoingAmountMsat uint64 `protobuf:"varint,7,opt,name=outgoing_amount_msat,json=outgoingAmountMsat,proto3" json:"outgoing_amount_msat,omitempty"`
diff --git a/lnrpc/routerrpc/router.swagger.json b/lnrpc/routerrpc/router.swagger.json
index 3cccab795..0c3efa6f0 100644
--- a/lnrpc/routerrpc/router.swagger.json
+++ b/lnrpc/routerrpc/router.swagger.json
@@ -1354,7 +1354,8 @@
         },
         "incoming_amount_msat": {
           "type": "string",
-          "format": "uint64"
+          "format": "uint64",
+          "description": "incoming_amount_msat is used to set the p2p message incoming amount field\nfor validating an incoming HTLC."
         },
         "outgoing_amount_msat": {
           "type": "string",
diff --git a/lnwallet/wallet.go b/lnwallet/wallet.go
index 19b42a58d..487a2c796 100644
--- a/lnwallet/wallet.go
+++ b/lnwallet/wallet.go
@@ -229,8 +229,6 @@ type InitFundingReserveMsg struct {
 	// channel that will be useful to our future selves.
 	Memo []byte
 
-	CustomChannelData []byte
-
 	// TapscriptRoot is an optional tapscript root that if provided, will
 	// be used to create the combined key for musig2 based channels.
 	TapscriptRoot fn.Option[chainhash.Hash]
diff --git a/rpcserver.go b/rpcserver.go
index 8af976e65..a8496b584 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -2298,7 +2298,6 @@ func (r *rpcServer) parseOpenChannelReq(in *lnrpc.OpenChannelRequest,
 		FundUpToMaxAmt:    fundUpToMaxAmt,
 		MinFundAmt:        minFundAmt,
 		Memo:              []byte(in.Memo),
-		CustomChannelData: in.CustomChannelData,
 		Outpoints:         outpoints,
 	}, nil
 }