diff --git a/compiler/res/prog8lib/cx16/syslib.p8 b/compiler/res/prog8lib/cx16/syslib.p8
index fbdad6482..137c13a0b 100644
--- a/compiler/res/prog8lib/cx16/syslib.p8
+++ b/compiler/res/prog8lib/cx16/syslib.p8
@@ -240,7 +240,6 @@ romsub $ff0b = FB_set_pixel(ubyte color @A)  clobbers(A,X,Y)
 romsub $ff0e = FB_set_pixels(uword pointer @R0, uword count @R1)  clobbers(A,X,Y)
 romsub $ff11 = FB_set_8_pixels(ubyte pattern @A, ubyte color @X)  clobbers(A,X,Y)
 romsub $ff14 = FB_set_8_pixels_opaque(ubyte pattern @R0, ubyte mask @A, ubyte color1 @X, ubyte color2 @Y)  clobbers(A,X,Y)
-romsub $ff14 = FB_set_8_pixels_opaque_OLD(ubyte mask @A, ubyte color1 @X, ubyte color2 @Y)  clobbers(A,X,Y)     ; TODO WEG!!!!
 romsub $ff17 = FB_fill_pixels(uword count @R0, uword pstep @R1, ubyte color @A)  clobbers(A,X,Y)
 romsub $ff1a = FB_filter_pixels(uword pointer @ R0, uword count @R1)  clobbers(A,X,Y)
 romsub $ff1d = FB_move_pixels(uword sx @R0, uword sy @R1, uword tx @R2, uword ty @R3, uword count @R4)  clobbers(A,X,Y)
diff --git a/examples/cx16/imageviewer/bmp_module.p8 b/examples/cx16/imageviewer/bmp_module.p8
index 2fc6d8bb5..4e0b6c122 100644
--- a/examples/cx16/imageviewer/bmp_module.p8
+++ b/examples/cx16/imageviewer/bmp_module.p8
@@ -104,10 +104,8 @@ bmp_module {
                         }
                     }
                     1 -> {
-                        for x in 0 to width-1 step 8 {
-                            cx16.r0 = c64.CHRIN()
-                            cx16.FB_set_8_pixels_opaque_OLD(255, 255, 0)        ; TODO update
-                        }
+                        for x in 0 to width-1 step 8
+                            cx16.FB_set_8_pixels_opaque(c64.CHRIN(), 255, 255, 0)
                     }
                 }
 
diff --git a/examples/cx16/imageviewer/imageviewer.p8 b/examples/cx16/imageviewer/imageviewer.p8
index a45cf2475..027bd5472 100644
--- a/examples/cx16/imageviewer/imageviewer.p8
+++ b/examples/cx16/imageviewer/imageviewer.p8
@@ -8,9 +8,6 @@
 %import bmp_module
 ;; %import ci_module
 
-; TODO fix crash after first image (occurs since cx16 register support was added in compiler)
-
-
 main {
     sub start() {
         ; trick to check if we're running on sdcard or host system shared folder
diff --git a/examples/cx16/imageviewer/pcx_module.p8 b/examples/cx16/imageviewer/pcx_module.p8
index 97d39773b..dc09a652c 100644
--- a/examples/cx16/imageviewer/pcx_module.p8
+++ b/examples/cx16/imageviewer/pcx_module.p8
@@ -100,17 +100,13 @@ bitmap {
                 b &= %00111111
                 ubyte dat = c64.CHRIN()
                 repeat b {
-                    if y_ok {
-                        cx16.r0 = dat
-                        cx16.FB_set_8_pixels_opaque_OLD(255, 255, 0)        ; TODO update
-                    }
+                    if y_ok
+                        cx16.FB_set_8_pixels_opaque(dat, 255, 255, 0)
                     px += 8
                 }
             } else {
-                if y_ok {
-                    cx16.r0 = b
-                    cx16.FB_set_8_pixels_opaque_OLD(255, 255, 0)    ; TODO update
-                }
+                if y_ok
+                    cx16.FB_set_8_pixels_opaque(b, 255, 255, 0)
                 px += 8
             }
             if px==width