diff --git a/libsrc/cbm/Makefile b/libsrc/cbm/Makefile
index fbcaeeeed..5e3396e13 100644
--- a/libsrc/cbm/Makefile
+++ b/libsrc/cbm/Makefile
@@ -70,7 +70,6 @@ S_OBJS =	c_acptr.o	\
 		ctype.o  	\
 		cvline.o 	\
                 devicedir.o     \
-                devicestr.o     \
                 dir.o           \
                 diskcmd.o       \
                 exehdr.o        \
diff --git a/libsrc/cbm/devicestr.s b/libsrc/cbm/devicestr.s
deleted file mode 100644
index 15b4b6c4a..000000000
--- a/libsrc/cbm/devicestr.s
+++ /dev/null
@@ -1,35 +0,0 @@
-;
-; Stefan Haubenthal, 2005-06-08
-;
-; CBM device to string
-;
-
-	.export		devicestr
-	.import		pusha0, tosudiva0
-	.importzp	sreg, ptr1, ptr2
-
-	.macpack	generic
-
-;------------------------------------------------------------------------------
-; Convert unit number in A into string representation pointed to by ptr2.
-
-.proc	devicestr
-
-	jsr	pusha0
-	lda	#10
-	jsr	tosudiva0
-	ldy	#0
-	lda	sreg
-	beq	:+		; >=10
-	add	#'0'
-	sta	(ptr2),y
-	iny
-:	lda	ptr1		; rem
-	add	#'0'
-	sta	(ptr2),y
-	iny
-	lda	#0
-	sta	(ptr2),y
-	rts
-
-.endproc
diff --git a/libsrc/cbm/initcwd.s b/libsrc/cbm/initcwd.s
index 5f43bc867..d5eb7fb90 100644
--- a/libsrc/cbm/initcwd.s
+++ b/libsrc/cbm/initcwd.s
@@ -4,19 +4,38 @@
 ; CBM _curunit to _cwd
 ;
 
-	.export		initcwd
-	.import		__curunit, __cwd, devicestr
-	.importzp	ptr2
+	.export		initcwd, devicestr
+	.import		__curunit, __cwd
+	.import		pusha0, tosudiva0
+	.importzp	sreg, ptr1, ptr2
 
-	.segment	"INIT"
-
-.proc	initcwd
+	.macpack	generic
 
+initcwd:
 	lda	#<__cwd
 	ldx	#>__cwd
 	sta	ptr2
 	stx	ptr2+1
 	lda	__curunit
-	jmp	devicestr
+	; Fall through
 
-.endproc
+;------------------------------------------------------------------------------
+; Convert unit number in A into string representation pointed to by ptr2.
+
+devicestr:
+	jsr	pusha0
+	lda	#10
+	jsr	tosudiva0
+	ldy	#0
+	lda	sreg
+	beq	:+		; >=10
+	add	#'0'
+	sta	(ptr2),y
+	iny
+:	lda	ptr1		; rem
+	add	#'0'
+	sta	(ptr2),y
+	iny
+	lda	#0
+	sta	(ptr2),y
+	rts