diff --git a/epicardium/epicardium.h b/epicardium/epicardium.h
index 56158107b55508454eb8ed5931b5a463e29abbec..266a5a266174450d1ae2cf70b63b46582d1353db 100644
--- a/epicardium/epicardium.h
+++ b/epicardium/epicardium.h
@@ -3,8 +3,6 @@
 
 #include <stdint.h>
 #include <errno.h>
-#include <stdbool.h>
-#include <stddef.h>
 
 #ifndef __SPHINX_DOC
 /* Some headers are not recognized by hawkmoth for some odd reason */
diff --git a/epicardium/main.c b/epicardium/main.c
index c1a9b08b60c45b3a6b8ab4f290a3dc8cf5a001d4..8c260528f12a535501a22bbde882b8d4f5d0fa88 100644
--- a/epicardium/main.c
+++ b/epicardium/main.c
@@ -58,7 +58,7 @@ int main(void)
 		    NULL,
 		    tskIDLE_PRIORITY + 1,
 		    NULL) != pdPASS) {
-		printf("Failed to create bhi160 dispatcher task!\n");
+		LOG_CRIT("startup", "Failed to create %s task!", "BHI160");
 		abort();
 	}
 
diff --git a/pycardium/modules/bhi160-sys.c b/pycardium/modules/bhi160-sys.c
index 49c70b5155426eb1acc9492535bbce72601d00ae..c5bde71474fc0c987bd10eaaff404c365a2196a7 100644
--- a/pycardium/modules/bhi160-sys.c
+++ b/pycardium/modules/bhi160-sys.c
@@ -23,10 +23,6 @@ STATIC mp_obj_t mp_bhi160_enable_sensor(size_t n_args, const mp_obj_t *args)
 	cfg.sample_rate                 = mp_obj_get_int(args[2]);
 	cfg.dynamic_range               = mp_obj_get_int(args[3]);
 
-	//cfg.sample_buffer_len = 200;
-	//cfg.sample_rate       = 4;
-	//cfg.dynamic_range     = 2;
-
 	int sd = epic_bhi160_enable_sensor(sensor_type, &cfg);
 
 	return MP_OBJ_NEW_SMALL_INT(sd);