diff --git a/flight/pios/common/libraries/yaffs2/simposix/yaffs_impl.mk b/flight/pios/posix/libraries/yaffs2/yaffs_impl.mk
similarity index 100%
rename from flight/pios/common/libraries/yaffs2/simposix/yaffs_impl.mk
rename to flight/pios/posix/libraries/yaffs2/yaffs_impl.mk
diff --git a/flight/pios/common/libraries/yaffs2/simposix/yaffs_nor_drv.c b/flight/pios/posix/libraries/yaffs2/yaffs_nor_drv.c
similarity index 100%
rename from flight/pios/common/libraries/yaffs2/simposix/yaffs_nor_drv.c
rename to flight/pios/posix/libraries/yaffs2/yaffs_nor_drv.c
diff --git a/flight/pios/common/libraries/yaffs2/simposix/yaffs_nor_drv.h b/flight/pios/posix/libraries/yaffs2/yaffs_nor_drv.h
similarity index 100%
rename from flight/pios/common/libraries/yaffs2/simposix/yaffs_nor_drv.h
rename to flight/pios/posix/libraries/yaffs2/yaffs_nor_drv.h
diff --git a/flight/pios/common/libraries/yaffs2/simposix/yaffs_osglue.c b/flight/pios/posix/libraries/yaffs2/yaffs_osglue.c
similarity index 100%
rename from flight/pios/common/libraries/yaffs2/simposix/yaffs_osglue.c
rename to flight/pios/posix/libraries/yaffs2/yaffs_osglue.c
diff --git a/flight/pios/common/libraries/yaffs2/simposix/yaffscfg2k.c b/flight/pios/posix/libraries/yaffs2/yaffscfg2k.c
similarity index 100%
rename from flight/pios/common/libraries/yaffs2/simposix/yaffscfg2k.c
rename to flight/pios/posix/libraries/yaffs2/yaffscfg2k.c
diff --git a/flight/pios/common/libraries/yaffs2/simposix/ynorsim.c b/flight/pios/posix/libraries/yaffs2/ynorsim.c
similarity index 100%
rename from flight/pios/common/libraries/yaffs2/simposix/ynorsim.c
rename to flight/pios/posix/libraries/yaffs2/ynorsim.c
diff --git a/flight/pios/common/libraries/yaffs2/simposix/ynorsim.h b/flight/pios/posix/libraries/yaffs2/ynorsim.h
similarity index 100%
rename from flight/pios/common/libraries/yaffs2/simposix/ynorsim.h
rename to flight/pios/posix/libraries/yaffs2/ynorsim.h
diff --git a/flight/targets/boards/simposix/firmware/Makefile b/flight/targets/boards/simposix/firmware/Makefile
index bb85fd059..0fdefb0cc 100644
--- a/flight/targets/boards/simposix/firmware/Makefile
+++ b/flight/targets/boards/simposix/firmware/Makefile
@@ -71,7 +71,7 @@ UAVOBJSYNTHDIR = $(OUTDIR)/../uavobject-synthetics/flight
 # optional component libraries
 include $(PIOS)/common/libraries/FreeRTOS/library.mk
 include $(PIOS)/common/libraries/yaffs2/library.mk
-include $(PIOS)/common/libraries/yaffs2/simposix/yaffs_impl.mk
+include $(PIOS)/posix/libraries/yaffs2/yaffs_impl.mk
 #include $(FLIGHTLIB)/PyMite/pymite.mk
 
 # List C source files here. (C dependencies are automatically generated.)
diff --git a/flight/uavobjects/inc/uavobjectmanager.h b/flight/uavobjects/inc/uavobjectmanager.h
index 893e49f4a..4f07f5953 100644
--- a/flight/uavobjects/inc/uavobjectmanager.h
+++ b/flight/uavobjects/inc/uavobjectmanager.h
@@ -202,10 +202,6 @@ uint8_t UAVObjUpdateCRC(UAVObjHandle obj_handle, uint16_t instId, uint8_t crc);
 int32_t UAVObjSave(UAVObjHandle obj_handle, uint16_t instId);
 int32_t UAVObjLoad(UAVObjHandle obj_handle, uint16_t instId);
 int32_t UAVObjDelete(UAVObjHandle obj_handle, uint16_t instId);
-#if defined(PIOS_INCLUDE_SDCARD)
-int32_t UAVObjSaveToFile(UAVObjHandle obj_handle, uint16_t instId);
-int32_t UAVObjLoadFromFile(UAVObjHandle obj_handle);
-#endif
 int32_t UAVObjSaveSettings();
 int32_t UAVObjLoadSettings();
 int32_t UAVObjDeleteSettings();