diff --git a/devicemodel/core/vrpmb.c b/devicemodel/core/vrpmb.c
index 910c53287..201ea7a1f 100644
--- a/devicemodel/core/vrpmb.c
+++ b/devicemodel/core/vrpmb.c
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include <openssl/rand.h>
 
 #include "types.h"
diff --git a/devicemodel/hw/pci/core.c b/devicemodel/hw/pci/core.c
index 81d7b16e9..59c45f5df 100644
--- a/devicemodel/hw/pci/core.c
+++ b/devicemodel/hw/pci/core.c
@@ -2291,7 +2291,8 @@ pci_emul_cfgdata(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 {
 	int coff;
 
-	assert(bytes == 1 || bytes == 2 || bytes == 4);
+	if ((bytes != 1) && (bytes != 2) && (bytes != 4))
+		return -1;
 
 	coff = cfgoff + (port - CONF1_DATA_PORT);
 	if (cfgenable) {
diff --git a/devicemodel/hw/platform/debugexit.c b/devicemodel/hw/platform/debugexit.c
index 26ea1da96..239209a0f 100644
--- a/devicemodel/hw/platform/debugexit.c
+++ b/devicemodel/hw/platform/debugexit.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/devicemodel/hw/platform/tpm/tpm.c b/devicemodel/hw/platform/tpm/tpm.c
index c613625c6..cbd1e7a48 100644
--- a/devicemodel/hw/platform/tpm/tpm.c
+++ b/devicemodel/hw/platform/tpm/tpm.c
@@ -6,7 +6,6 @@
  */
 
 #include <stdlib.h>
-#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdbool.h>
diff --git a/devicemodel/hw/platform/tpm/tpm_crb.c b/devicemodel/hw/platform/tpm/tpm_crb.c
index affc57d6c..78bd830ab 100644
--- a/devicemodel/hw/platform/tpm/tpm_crb.c
+++ b/devicemodel/hw/platform/tpm/tpm_crb.c
@@ -10,7 +10,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-#include <assert.h>
 #include <pthread.h>
 
 #include "vmmapi.h"
diff --git a/devicemodel/hw/platform/tpm/tpm_emulator.c b/devicemodel/hw/platform/tpm/tpm_emulator.c
index 6c260b163..9e8a328ca 100644
--- a/devicemodel/hw/platform/tpm/tpm_emulator.c
+++ b/devicemodel/hw/platform/tpm/tpm_emulator.c
@@ -19,7 +19,6 @@
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <assert.h>
 
 #include "vmmapi.h"
 #include "tpm_internal.h"
diff --git a/devicemodel/hw/platform/usb_mouse.c b/devicemodel/hw/platform/usb_mouse.c
index 707cfcdcd..cdb4f919e 100644
--- a/devicemodel/hw/platform/usb_mouse.c
+++ b/devicemodel/hw/platform/usb_mouse.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "usb.h"
 #include "usbdi.h"
diff --git a/devicemodel/hw/platform/usb_pmapper.c b/devicemodel/hw/platform/usb_pmapper.c
index 1f1975d1c..d17a363dd 100755
--- a/devicemodel/hw/platform/usb_pmapper.c
+++ b/devicemodel/hw/platform/usb_pmapper.c
@@ -8,7 +8,6 @@
 
 #include <pthread.h>
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
 #include <unistd.h>
 #include "usb.h"
diff --git a/devicemodel/hw/usb_core.c b/devicemodel/hw/usb_core.c
index a18cda0e3..3a0f8e21f 100644
--- a/devicemodel/hw/usb_core.c
+++ b/devicemodel/hw/usb_core.c
@@ -76,7 +76,6 @@
  */
 
 #include <sys/types.h>
-#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>