diff --git a/src/safeposix/syscalls/sys_calls.rs b/src/safeposix/syscalls/sys_calls.rs
index cd7f977..85a7b15 100644
--- a/src/safeposix/syscalls/sys_calls.rs
+++ b/src/safeposix/syscalls/sys_calls.rs
@@ -113,18 +113,19 @@ impl Cage {
         let newsigset = interface::RustHashMap::new();
         if !interface::RUSTPOSIX_TESTSUITE.load(interface::RustAtomicOrdering::Relaxed) {
             // we don't add these for the test suite
-            let mainsigsetatomic = self
-                .sigset
-                .get(
-                    &self
-                        .main_threadid
-                        .load(interface::RustAtomicOrdering::Relaxed),
-                )
-                .unwrap();
-            let mainsigset = interface::RustAtomicU64::new(
-                mainsigsetatomic.load(interface::RustAtomicOrdering::Relaxed),
-            );
-            newsigset.insert(0, mainsigset);
+            // BUG: Signals are commented out until we add them to lind-wasm
+            // let mainsigsetatomic = self
+            //     .sigset
+            //     .get(
+            //         &self
+            //             .main_threadid
+            //             .load(interface::RustAtomicOrdering::Relaxed),
+            //     )
+            //     .unwrap();
+            // let mainsigset = interface::RustAtomicU64::new(
+            //     mainsigsetatomic.load(interface::RustAtomicOrdering::Relaxed),
+            // );
+            // newsigset.insert(0, mainsigset);
         }
 
         /*
@@ -206,18 +207,19 @@ impl Cage {
         let newsigset = interface::RustHashMap::new();
         if !interface::RUSTPOSIX_TESTSUITE.load(interface::RustAtomicOrdering::Relaxed) {
             // we don't add these for the test suite
-            let mainsigsetatomic = self
-                .sigset
-                .get(
-                    &self
-                        .main_threadid
-                        .load(interface::RustAtomicOrdering::Relaxed),
-                )
-                .unwrap();
-            let mainsigset = interface::RustAtomicU64::new(
-                mainsigsetatomic.load(interface::RustAtomicOrdering::Relaxed),
-            );
-            newsigset.insert(0, mainsigset);
+            // BUG: Signals are commented out until we add them to lind-wasm
+            // let mainsigsetatomic = self
+            //     .sigset
+            //     .get(
+            //         &self
+            //             .main_threadid
+            //             .load(interface::RustAtomicOrdering::Relaxed),
+            //     )
+            //     .unwrap();
+            // let mainsigset = interface::RustAtomicU64::new(
+            //     mainsigsetatomic.load(interface::RustAtomicOrdering::Relaxed),
+            // );
+            // newsigset.insert(0, mainsigset);
         }
 
         let newcage = Cage {
@@ -259,9 +261,10 @@ impl Cage {
         // Trigger SIGCHLD
         if !interface::RUSTPOSIX_TESTSUITE.load(interface::RustAtomicOrdering::Relaxed) {
             // dont trigger SIGCHLD for test suite
-            if self.cageid != self.parent {
-                interface::lind_kill_from_id(self.parent, libc::SIGCHLD);
-            }
+            // BUG: Signals are commented out until we add them to lind-wasm
+            // if self.cageid != self.parent {
+            //     interface::lind_kill_from_id(self.parent, libc::SIGCHLD);
+            // }
         }
 
         //fdtable will be dropped at end of dispatcher scope because of Arc