diff --git a/src/basic/basic_commands/cmd_let.s b/src/basic/basic_commands/cmd_let.s
index bfd8822b..880893d8 100644
--- a/src/basic/basic_commands/cmd_let.s
+++ b/src/basic/basic_commands/cmd_let.s
@@ -175,7 +175,7 @@ cmd_let_assign_string:
 
 	lda DSCPNT+0
 	bne !+
-	jsr varstr_free_DSCPNT_set
+	jsr varstr_free
 !:
 	// Set the new variable as empty string
 
@@ -277,7 +277,7 @@ cmd_let_assign_string_not_text_area:
 	// Free the memory belonging to the old string
 
 	// XXX
-	// jsr varstr_free_DSCPNT_set
+	// jsr varstr_free
 
 
 	// And allocate memory for the new string
diff --git a/src/basic/engine/varstr_free.s b/src/basic/engine/varstr_free.s
index 95fb88b1..a2705e8d 100644
--- a/src/basic/engine/varstr_free.s
+++ b/src/basic/engine/varstr_free.s
@@ -6,57 +6,14 @@
 // Releases back memory used by string
 //
 // Input:
-// - DSCPNT+1, DSCPNT+2 - pointer to string descriptor
+// - DSCPNT+1, DSCPNT+2 - pointer to string
 //
 
 // XXX test this routine
 // XXX check if this entry point is needed
 
-varstr_free: // XXX is it needed? if not, we do not need peek_under_roms_via_DSCPNT_PLUS_1
 
-	// First copy the string descriptor data to DSCPNT
-	// XXX write optimized version for CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
-
-	ldy #$00
-
-#if CONFIG_MEMORY_MODEL_60K
-	ldx #<DSCPNT+1
-	jsr peek_under_roms
-#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
-	jsr peek_under_roms_via_DSCPNT_PLUS_1
-#else // CONFIG_MEMORY_MODEL_38K
-	lda (DSCPNT+1),y
-#endif
-
-	sta DSCPNT+0                                 // length of the string
-	iny
-
-#if CONFIG_MEMORY_MODEL_60K
-	jsr peek_under_roms
-#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
-	jsr peek_under_roms_via_DSCPNT_PLUS_1
-#else // CONFIG_MEMORY_MODEL_38K
-	lda (DSCPNT+1),y
-#endif
-
-	pha
-	iny
-
-#if CONFIG_MEMORY_MODEL_60K
-	jsr peek_under_roms
-#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
-	jsr peek_under_roms_via_DSCPNT_PLUS_1
-#else // CONFIG_MEMORY_MODEL_38K
-	lda (DSCPNT+1),y
-#endif
-
-	sta DSCPNT+2
-	pla
-	sta DSCPNT+1
-
-	// FALLTROUGH
-
-varstr_free_DSCPNT_set:
+varstr_free:
 
 	// XXX consider moving size check (DSCPNT+0) here
 
diff --git a/src/basic/memory/under_rom_peek_fetch_46k_50k.s b/src/basic/memory/under_rom_peek_fetch_46k_50k.s
index c1b4fc9c..6aedc40d 100644
--- a/src/basic/memory/under_rom_peek_fetch_46k_50k.s
+++ b/src/basic/memory/under_rom_peek_fetch_46k_50k.s
@@ -68,23 +68,6 @@ peek_under_roms_via_VARPNT:
 	jmp peek_under_roms_finalize
 #endif
 
-peek_under_roms_via_DSCPNT_PLUS_1:
-
-	// Unmap BASIC lower ROM
-
-	lda #$26
-	sta CPU_R6510
-
-	// Retrieve value from under ROMs
-
-	lda (DSCPNT+1), y
-
-#if HAS_OPCODES_65C02
-	bra peek_under_roms_finalize
-#else
-	jmp peek_under_roms_finalize
-#endif
-
 peek_under_roms_via_FAC1_PLUS_1:
 
 	// Unmap BASIC lower ROM