diff --git a/src/internal.rs b/src/internal.rs
index 7c864988c..02c8f610d 100644
--- a/src/internal.rs
+++ b/src/internal.rs
@@ -304,11 +304,6 @@ pub(crate) struct TaskThreadDataDelayedFg {
     pub grain: Grain,
 }
 
-// TODO(SJC): Remove when TaskThreadDataDelayedFg is thread-safe
-unsafe impl Send for TaskThreadDataDelayedFg {}
-// TODO(SJC): Remove when TaskThreadDataDelayedFg is thread-safe
-unsafe impl Sync for TaskThreadDataDelayedFg {}
-
 #[derive(Default)]
 #[repr(C)]
 pub(crate) struct TaskThreadData {
@@ -436,11 +431,6 @@ pub struct Rav1dContext {
     pub(crate) picture_pool: Arc<MemPool<u8>>,
 }
 
-// TODO(SJC): Remove when Rav1dContext is thread-safe
-unsafe impl Send for Rav1dContext {}
-// TODO(SJC): Remove when Rav1dContext is thread-safe
-unsafe impl Sync for Rav1dContext {}
-
 #[derive(Default)]
 #[repr(C)]
 pub struct Rav1dTask {