diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index f5a1880363..d3d437823d 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -25,9 +25,7 @@
  */
 
 #include "py/mpconfig.h"
-// *_ADHOC part is for cc3200 port which doesn't use general uPy
-// infrastructure and instead duplicates code. TODO: Resolve.
-#if MICROPY_VFS || MICROPY_FSUSERMOUNT || MICROPY_FSUSERMOUNT_ADHOC
+#if MICROPY_VFS || MICROPY_FSUSERMOUNT
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/extmod/vfs_fat_misc.c b/extmod/vfs_fat_misc.c
index 2f06d9f637..7e7576398b 100644
--- a/extmod/vfs_fat_misc.c
+++ b/extmod/vfs_fat_misc.c
@@ -25,9 +25,7 @@
  */
 
 #include "py/mpconfig.h"
-// *_ADHOC part is for cc3200 port which doesn't use general uPy
-// infrastructure and instead duplicates code. TODO: Resolve.
-#if MICROPY_VFS_FAT || MICROPY_FSUSERMOUNT || MICROPY_FSUSERMOUNT_ADHOC
+#if MICROPY_VFS_FAT || MICROPY_FSUSERMOUNT
 
 #include <string.h>
 #include "py/nlr.h"