diff --git a/libsrc/runtime/Makefile b/libsrc/runtime/Makefile
index 803a31765..27b037a27 100644
--- a/libsrc/runtime/Makefile
+++ b/libsrc/runtime/Makefile
@@ -170,7 +170,6 @@ OBJS = 	add.o		\
        	shreax3.o	\
 	shreax4.o	\
 	staspidx.o	\
-	staspp.o	\
        	staxsp.o	\
 	staxspi.o	\
 	staxspp.o	\
diff --git a/libsrc/runtime/ldai.s b/libsrc/runtime/ldai.s
index 0dc1ef28d..ec3a99610 100644
--- a/libsrc/runtime/ldai.s
+++ b/libsrc/runtime/ldai.s
@@ -4,15 +4,16 @@
 ; CC65 runtime: Load a indirect from address in ax
 ;
 
-	.export		ldai, ldaidx
+	.export		ldaidx
 	.importzp	ptr1
 
-ldai:	ldy	#$00
-ldaidx:	sta	ptr1
+.proc	ldaidx
+	sta 	ptr1
 	stx	ptr1+1
 	ldx	#$00
 	lda	(ptr1),y
-	bpl	L9
+	bpl	@L1
 	dex
-L9:	rts
+@L1:	rts
+.endproc
 
diff --git a/libsrc/runtime/ldaui.s b/libsrc/runtime/ldaui.s
index b61ff1f3e..b84783df3 100644
--- a/libsrc/runtime/ldaui.s
+++ b/libsrc/runtime/ldaui.s
@@ -4,15 +4,13 @@
 ; CC65 runtime: Load a unsigned indirect from address in ax
 ;
 
-	.export		ldaui, ldauidx
+	.export		ldauidx
 	.importzp	ptr1
-	   
-ldaui:	
-	ldy	#0
-ldauidx:
+
+.proc	ldauidx
 	sta	ptr1
 	stx	ptr1+1
 	ldx	#0
 	lda	(ptr1),y
 	rts
-
+.endproc
diff --git a/libsrc/runtime/staspp.s b/libsrc/runtime/staspp.s
deleted file mode 100644
index a664dde9b..000000000
--- a/libsrc/runtime/staspp.s
+++ /dev/null
@@ -1,26 +0,0 @@
-;
-; Ullrich von Bassewitz, 25.10.2000
-;
-; CC65 runtime: Store a indirect into address at top of stack
-;
-
-       	.export	       	staspp
-	.import		incsp2
-	.importzp	sp, ptr1
-
-.proc	staspp
-
-	ldy   	#1
-	pha
-	lda   	(sp),y
-	sta   	ptr1+1
-	dey
-	lda   	(sp),y
-	sta	ptr1
-	pla
-	sta	(ptr1),y
-       	jmp	incsp2	       	; Drop address
-
-.endproc
-
-