diff --git a/src/pic.c b/src/pic.c
index b0d872e00..816929460 100644
--- a/src/pic.c
+++ b/src/pic.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel PIC chip emulation.
  *
- * Version:	@(#)pic.c	1.0.4	2019/01/21
+ * Version:	@(#)pic.c	1.0.5	2019/09/20
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *
@@ -142,13 +142,6 @@ pic_autoeoi()
 				pic.pend |= pic.icw3;
 		}
 
-#if 0
-		if ((pic_current & (1 << c)) && picint_is_level(c)) {
-			if (((1 << c) != pic.icw3) || !AT)
-				pic.pend |= 1 << c;
-		}
-#endif
-
 		pic_updatepending();
 		return;
 	}
@@ -213,13 +206,6 @@ pic_write(uint16_t addr, uint8_t val, void *priv)
 					pic.pend |= pic.icw3;
 			}
 
-#if 0
-			if ((pic_current & (1 << (val & 7))) && picint_is_level(val & 7)) {
-				if ((((1 << (val & 7)) != pic.icw3) || !AT))
-					pic.pend |= 1 << (val & 7);
-			}
-#endif
-
 			pic_updatepending();
 		} else {
 			for (c = 0; c < 8; c++) {
@@ -232,13 +218,6 @@ pic_write(uint16_t addr, uint8_t val, void *priv)
 							pic.pend |= pic.icw3;
 					}
 
-#if 0
-					if ((pic_current & (1 << c)) && picint_is_level(c)) {
-						if ((((1 << c) != pic.icw3) || !AT))
-							pic.pend |= 1 << c;
-					}
-#endif
-
 					if ((c == 1) && keywaiting)
 						intclear &= ~1;
 					pic_updatepending();
@@ -266,14 +245,10 @@ pic_read(uint16_t addr, void *priv)
     }
     if (pic.read) {
 	pic_log("Read PIC ins %02X\n", pic.ins);
-#if 0
 	if (AT)
 		return pic.ins | (pic2.ins ? 4 : 0);
 	else
 		return pic.ins;
-#else
-	return pic.ins | (pic2.ins ? 4 : 0);
-#endif
     }
     return pic.pend;
 }
@@ -303,13 +278,6 @@ pic2_autoeoi()
 		pic2.ins &= ~(1 << c);
 		pic_update_mask(&pic2.mask2, pic2.ins);
 
-#if 0
-		if (pic_current & (0x100 << c) && picint_is_level(c + 8)) {
-			pic2.pend |= (1 << c);
-			pic.pend |= (1 << pic2.icw3);
-		}
-#endif
-
 		pic_updatepending();
 		return;
 	}
@@ -359,27 +327,12 @@ pic2_write(uint16_t addr, uint8_t val, void *priv)
 			pic2.ins &= ~(1 << (val & 7));
 			pic_update_mask(&pic2.mask2, pic2.ins);
 
-#if 0
-			if (pic_current & (0x100 << (val & 7)) && picint_is_level((val & 7) + 8)) {
-				pic2.pend |= (1 << (val & 7));
-				pic.pend |= (1 << pic2.icw3);
-			}
-#endif
-
 			pic_updatepending();
 		} else {
 			for (c = 0; c < 8; c++) {
 				if (pic2.ins&(1<<c)) {
 					pic2.ins &= ~(1<<c);
 					pic_update_mask(&pic2.mask2, pic2.ins);
-
-#if 0
-					if (pic_current & (0x100 << c) && picint_is_level(c + 8)) {
-						pic2.pend |= (1 << c);
-						pic.pend |= (1 << pic2.icw3);
-					}
-#endif
-
 					pic_updatepending();
 					return;
 				}
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 0ce65f2ce..36f66cdf0 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -71,9 +71,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef PS2M70T4
   PS2M70T4	:= y
  endif
- ifndef RIVA128
-  RIVA128	:= y
- endif
  ifndef TC430HX
   TC430HX	:= y
  endif
@@ -129,9 +126,6 @@ else
  ifndef PS2M70T4
   PS2M70T4	:= n
  endif
- ifndef RIVA128
-  RIVA128	:= n
- endif
  ifndef TC430HX
   TC430HX	:= n
  endif
@@ -482,11 +476,6 @@ ifeq ($(PS2M70T4), y)
 OPTS		+= -DUSE_PS2M70T4
 endif
 
-ifeq ($(RIVA128), y)
-OPTS		+= -DUSE_RIVA128
-DEVBROBJ	+= vid_riva128.o
-endif
-
 ifeq ($(TC430HX), y)
 OPTS		+= -DUSE_TC430HX
 endif
diff --git a/src/win/Makefile_ndr.mingw b/src/win/Makefile_ndr.mingw
index 81c4c9e7b..93ec085d5 100644
--- a/src/win/Makefile_ndr.mingw
+++ b/src/win/Makefile_ndr.mingw
@@ -71,9 +71,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef PS2M70T4
   PS2M70T4	:= y
  endif
- ifndef RIVA128
-  RIVA128	:= y
- endif
  ifndef TC430HX
   TC430HX	:= y
  endif
@@ -129,9 +126,6 @@ else
  ifndef PS2M70T4
   PS2M70T4	:= n
  endif
- ifndef RIVA128
-  RIVA128	:= n
- endif
  ifndef TC430HX
   TC430HX	:= n
  endif
@@ -488,11 +482,6 @@ ifeq ($(PS2M70T4), y)
 OPTS		+= -DUSE_PS2M70T4
 endif
 
-ifeq ($(RIVA128), y)
-OPTS		+= -DUSE_RIVA128
-DEVBROBJ	+= vid_riva128.o
-endif
-
 ifeq ($(TC430HX), y)
 OPTS		+= -DUSE_TC430HX
 endif