diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/LICENSE b/flight/PiOS/STM32F10x/Libraries/minIni/LICENSE
deleted file mode 100644
index 68c771a09..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/LICENSE
+++ /dev/null
@@ -1,176 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/NOTICE b/flight/PiOS/STM32F10x/Libraries/minIni/NOTICE
deleted file mode 100644
index 6ce0ef3bd..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-minIni is a programmer's library to read and write "INI" files in embedded
-systems. The library takes little resources and can be configured for various
-kinds of file I/O libraries.
-
-The method for portable INI file management in minIni is, in part based, on the
-article "Multiplatform .INI Files" by Joseph J. Graf in the March 1994 issue of
-Dr. Dobb's Journal.
-
-The C++ class in minIni.h was contributed by Steven Van Ingelgem.
-
-The option to compile minIni as a read-only library was contributed by Luca
-Bassanello.
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/UPDATING.txt b/flight/PiOS/STM32F10x/Libraries/minIni/UPDATING.txt
deleted file mode 100644
index 577ade917..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/UPDATING.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Notes when upgrading MinINI to newer versions
-Gussy - 11/09
-
--> Do not overwrite the following files, these files are platofrm depantant
-----> minGlue.h
\ No newline at end of file
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/VERSION.txt b/flight/PiOS/STM32F10x/Libraries/minIni/VERSION.txt
deleted file mode 100644
index 61a0f4963..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/VERSION.txt
+++ /dev/null
@@ -1 +0,0 @@
-Current version is 0.8
\ No newline at end of file
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-FatFs.h b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-FatFs.h
deleted file mode 100644
index 3c14e4e83..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-FatFs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Glue functions for the minIni library, based on the FatFs and Tiny-FatFs
- *  libraries, see http://elm-chan.org/fsw/ff/00index_e.html
- *
- *  Copyright (c) ITB CompuPhase, 2008-2009
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
- *  use this file except in compliance with the License. You may obtain a copy
- *  of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#define INI_BUFFERSIZE  256       /* maximum line length, maximum path length */
-
-/* You must set _USE_STRFUNC to 1 or 2 in the include file ff.h (or tff.h)
- * to enable the "string functions" fgets() and fputs().
- */
-#include "ff.h"                   /* include tff.h for Tiny-FatFs */
-#define INI_FILETYPE    FIL
-
-#define ini_openread(filename,file)   (f_open((file),(filename),FA_READ+FA_OPEN_EXISTING) == 0)
-#define ini_openwrite(filename,file)  (f_open((file),(filename),FA_WRITE+FA_CREATE_ALWAYS) == 0)
-#define ini_close(file)               f_close(file)
-#define ini_read(buffer,size,file)    fgets((buffer),(size),(file))
-#define ini_write(buffer,file)        fputs((buffer),(file))
-#define ini_rename(source,dest)       f_rename((source),(dest))
-#define ini_remove(filename)          f_unlink(filename)
-#define ini_rewind(file)              f_lseek((file),0)
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-efsl.h b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-efsl.h
deleted file mode 100644
index ebb587a39..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-efsl.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Glue functions for the minIni library, based on the EFS Library, see
- *  http://www.efsl.be/
- *
- *  Copyright (c) ITB CompuPhase, 2008-2009
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
- *  use this file except in compliance with the License. You may obtain a copy
- *  of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-#define INI_BUFFERSIZE  256       /* maximum line length, maximum path length */
-
-#include "efs.h"
-#define INI_FILETYPE    EmbeddedFile
-#define INI_LINETERM    "\r\n"    /* set line termination explicitly */
-
-
-extern EmbeddedFileSystem g_efs;
-
-#define ini_openread(filename,file)   (file_fopen((file),&g_efs.myFs,(char*)(filename),'r') == 0)
-#define ini_openwrite(filename,file)  (file_fopen((file),&g_efs.myFs,(char*)(filename),'w') == 0)
-#define ini_close(file)               file_fclose(file)
-#define ini_read(buffer,size,file)    (file_read((file),(size),(buffer)) > 0)
-#define ini_write(buffer,file)        file_write((file),strlen(buffer),(char*)(buffer))
-#define ini_remove(filename)          rmfile(&g_efs.myFs,(char*)(filename))
-#define ini_rewind(file)              file_setpos(*(file),0)
-
-/* EFSL lacks a rename function, so instead we copy the file to the new name
- * and delete the old file
- */
-static int ini_rename(char *source, const char *dest)
-{
-  EmbeddedFile fr, fw;
-  int n;
-
-  if (file_fopen(&fr, &g_efs.myFs, source, 'r') != 0)
-    return 0;
-  if (rmfile(&g_efs.myFs, (char*)dest) != 0)
-    return 0;
-  if (file_fopen(&fw, &g_efs.myFs, (char*)dest, 'w') != 0)
-    return 0;
-
-  /* With some "insider knowledge", we can save some memory: the "source"
-   * parameter holds a filename that was built from the "dest" parameter. It
-   * was built in buffer and this buffer has the size INI_BUFFERSIZE. We can
-   * reuse this buffer for copying the file.
-   */
-  while (n=file_read(&fr, INI_BUFFERSIZE, source))
-    file_write(&fw, n, source);
-
-  file_fclose(&fr);
-  file_fclose(&fw);
-
-  /* Now we need to delete the source file. However, we have garbled the buffer
-   * that held the filename of the source. So we need to build it again.
-   */
-  ini_tempname(source, dest, INI_BUFFERSIZE);
-  return rmfile(&g_efs.myFs, source) == 0;
-}
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-stdio.h b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-stdio.h
deleted file mode 100644
index 8388564fc..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue-stdio.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Glue functions for the minIni library, based on the C/C++ stdio library
- *
- *  Or better said: this file contains macros that maps the function interface
- *  used by minIni to the standard C/C++ file I/O functions.
- *
- *  Copyright (c) ITB CompuPhase, 2008-2009
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
- *  use this file except in compliance with the License. You may obtain a copy
- *  of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- */
-
-/* map required file I/O to the standard C library */
-#include <stdio.h>
-#define ini_openread(filename,file)   ((*(file) = fopen((filename),"rt")) != NULL)
-#define ini_openwrite(filename,file)  ((*(file) = fopen((filename),"wt")) != NULL)
-#define ini_close(file)               fclose(*(file))
-#define ini_read(buffer,size,file)    fgets((buffer),(size),*(file))
-#define ini_write(buffer,file)        fputs((buffer),*(file))
-#define ini_rename(source,dest)       rename((source),(dest))
-#define ini_remove(filename)          remove(filename)
-#define ini_rewind(file)              rewind(*(file))
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.c b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.c
deleted file mode 100644
index 10f20168f..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "dosfs.h"
-#include "pios.h"
-#include "minGlue.h"
-
-/* Global Variables */
-extern uint8_t PIOS_SDCARD_Sector[SECTOR_SIZE];
-extern VOLINFO PIOS_SDCARD_VolInfo;
-
-/* Local Variables */
-static uint32_t SuccessCount;
-
-int dosfs_ini_openread(const char *filename, PFILEINFO file)
-{
-	if(DFS_OpenFile(&PIOS_SDCARD_VolInfo, (uint8_t *)filename, DFS_READ, PIOS_SDCARD_Sector, file)) {
-		/* Error opening file */
-		return 0;
-	}
-
-	/* No errors */
-	return 1;
-}
-
-int dosfs_ini_openwrite(const char *filename, PFILEINFO file)
-{
-	/* TODO: Check this works */
-	if(DFS_OpenFile(&PIOS_SDCARD_VolInfo, (uint8_t *)filename, DFS_WRITE, PIOS_SDCARD_Sector, file)) {
-		/* Error opening file */
-		return 0;
-	}
-
-	/* No errors */
-	return 1;
-}
-
-int dosfs_ini_close(PFILEINFO file)
-{
-	/* This doesn't actually do anything */
-	DFS_Close(file);
-
-	/* No errors */
-	return 1;
-}
-
-int dosfs_ini_read(char *buffer, int size, PFILEINFO file)
-{
-	if(PIOS_SDCARD_ReadLine(file, (uint8_t *)buffer, size) < 0)
-	{
-		/* Error reading line */
-		return 0;
-	}
-
-	/* No errors */
-	return 1;
-}
-
-int dosfs_ini_write(const char *buffer, PFILEINFO file)
-{
-	/* TODO: Check this works */
-	DFS_WriteFile(file, PIOS_SDCARD_Sector, (uint8_t *)buffer, &SuccessCount, sizeof(buffer));
-
-	/* No errors */
-	return 1;
-}
-
-int dosfs_ini_rename(const char *source, const char *dest)
-{
-	if(PIOS_SDCARD_FileCopy((char *)source, (char *)dest)) {
-		/* Error renaming file */
-		return 0;
-	}
-
-	/* No errors */
-	return 1;
-}
-
-int dosfs_ini_remove(const char *filename)
-{
-	/* Remove the file */
-	if(PIOS_SDCARD_FileDelete((char *)filename)) {
-		/* Error deleting file */
-		return 0;
-	}
-
-	/* No errors */
-	return 1;
-}
-
-int dosfs_ini_rewind(PFILEINFO file)
-{
-	/* TODO: Check this works */
-	DFS_Seek(file, 0, PIOS_SDCARD_Sector);
-	/* No errors */
-	return 1;
-}
-
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.h b/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.h
deleted file mode 100644
index e7e5e6e9d..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minGlue.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Glue functions for the minIni library */
-
-#define INI_LINETERM		"\r\n"
-#define NDEBUG
-#define INI_BUFFERSIZE		80
-// #define INI_BUFFERSIZE	256       /* maximum line length, maximum path length */
-
-#include "dosfs.h"
-#define INI_FILETYPE    FILEINFO
-
-#define ini_openread(filename,file)   dosfs_ini_openread(filename,file)
-#define ini_openwrite(filename,file)  dosfs_ini_openwrite(filename,file)
-#define ini_close(file)               dosfs_ini_close(file)
-#define ini_read(buffer,size,file)    dosfs_ini_read(buffer,size,file)
-#define ini_write(buffer,file)        dosfs_ini_write(buffer,file)
-#define ini_rename(source,dest)       dosfs_ini_rename(source,dest)
-#define ini_remove(filename)          dosfs_ini_remove(filename)
-#define ini_rewind(file)              dosfs_ini_rewind(file)
-
-extern int dosfs_ini_openread(const char *filename, PFILEINFO file);
-extern int dosfs_ini_openwrite(const char *filename, PFILEINFO file);
-extern int dosfs_ini_close(PFILEINFO file);
-extern int dosfs_ini_read(char *buffer, int size, PFILEINFO file);
-extern int dosfs_ini_write(const char *buffer, PFILEINFO file);
-extern int dosfs_ini_rename(const char *source, const char *dest);
-extern int dosfs_ini_remove(const char *filename);
-extern int dosfs_ini_rewind(PFILEINFO file);
-
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minIni.c b/flight/PiOS/STM32F10x/Libraries/minIni/minIni.c
deleted file mode 100644
index 87400029e..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minIni.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/*  minIni - Multi-Platform INI file parser, suitable for embedded systems
- *
- *  These routines are in part based on the article "Multiplatform .INI Files"
- *  by Joseph J. Graf in the March 1994 issue of Dr. Dobb's Journal.
- *
- *  Copyright (c) ITB CompuPhase, 2008-2009
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
- *  use this file except in compliance with the License. You may obtain a copy
- *  of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- *
- *  Version: $Id: minIni.c 24 2009-05-06 08:01:53Z thiadmer.riemersma $
- */
-
-#if (defined _UNICODE || defined __UNICODE__ || defined UNICODE) && !defined MININI_ANSI
-# if !defined UNICODE   /* for Windows */
-#   define UNICODE
-# endif
-# if !defined _UNICODE  /* for C library */
-#   define _UNICODE
-# endif
-#endif
-
-#include "minIni.h"
-#if defined NDEBUG
-  #define assert(e)
-#else
-  #include <assert.h>
-#endif
-
-#if !defined __T
-  #include <string.h>
-  #include <stdlib.h>
-  /* definition of TCHAR already in minIni.h */
-  #define __T(s)    s
-  #define _tcscat   strcat
-  #define _tcschr   strchr
-  #define _tcscmp   strcmp
-  #define _tcscpy   strcpy
-  #define _tcsicmp  stricmp
-  #define _tcslen   strlen
-  #define _tcsncpy  strncpy
-  #define _tcsnicmp strnicmp
-  #define _tcsrchr  strrchr
-  #define _tcstol   strtol
-  #define _tfgets   fgets
-  #define _tfputs   fputs
-  #define _tfopen   fopen
-  #define _tremove  remove
-  #define _trename  rename
-#endif
-
-#if defined __linux || defined __linux__
-  #define __LINUX__
-#endif
-#if defined FREEBSD && !defined __FreeBSD__
-  #define __FreeBSD__
-#endif
-#if !defined strnicmp
-  #if defined __LINUX__ || defined __FreeBSD__ || defined __OpenBSD__
-    #define strnicmp  strncasecmp
-  #endif
-#endif
-
-#if !defined INI_LINETERM
-  #define INI_LINETERM    __T("\n")
-#endif
-#if !defined INI_FILETYPE
-  #define INI_FILETYPE    FILE*
-#endif
-
-#if !defined sizearray
-  #define sizearray(a)    (sizeof(a) / sizeof((a)[0]))
-#endif
-
-enum quote_option {
-  QUOTE_NONE,
-  QUOTE_ENQUOTE,
-  QUOTE_DEQUOTE,
-};
-
-static TCHAR *skipleading(const TCHAR *str)
-{
-  assert(str != NULL);
-  while (*str != '\0' && *str <= ' ')
-    str++;
-  return (TCHAR *)str;
-}
-
-static TCHAR *skiptrailing(const TCHAR *str, const TCHAR *base)
-{
-  assert(str != NULL);
-  assert(base != NULL);
-  while (str > base && *(str-1) <= ' ')
-    str--;
-  return (TCHAR *)str;
-}
-
-static TCHAR *striptrailing(TCHAR *str)
-{
-  TCHAR *ptr = skiptrailing(_tcschr(str, '\0'), str);
-  assert(ptr != NULL);
-  *ptr='\0';
-  return str;
-}
-
-static TCHAR *save_strncpy(TCHAR *dest, const TCHAR *source, size_t maxlen, enum quote_option option)
-{
-  int d, s;
-
-  assert(maxlen>0);
-  if (option == QUOTE_ENQUOTE && maxlen < 3)
-    option = QUOTE_NONE;  /* cannot store two quotes and a terminating zero in less than 3 characters */
-
-  switch (option) {
-  case QUOTE_NONE:
-    _tcsncpy(dest,source,maxlen);
-    dest[maxlen-1]='\0';
-    break;
-  case QUOTE_ENQUOTE:
-    d = 0;
-    dest[d++] = '"';
-    for (s = 0; source[s] != '\0' && d < maxlen - 2; s++, d++) {
-      if (source[s] == '"') {
-        if (d >= maxlen - 3)
-          break;  /* no space to store the escape character plus the one that follows it */
-        dest[d++] = '\\';
-      } /* if */
-      dest[d] = source[s];
-    } /* for */
-    dest[d++] = '"';
-    dest[d] = '\0';
-    break;
-  case QUOTE_DEQUOTE:
-    for (d = s = 0; source[s] != '\0' && d < maxlen - 1; s++, d++) {
-      if ((source[s] == '"' || source[s] == '\\') && source[s + 1] == '"')
-        s++;
-      dest[d] = source[s];
-    } /* for */
-    dest[d] = '\0';
-    break;
-  default:
-    assert(0);
-  } /* switch */
-
-  return dest;
-}
-
-static int getkeystring(INI_FILETYPE *fp, const TCHAR *Section, const TCHAR *Key,
-                        int idxSection, int idxKey, TCHAR *Buffer, int BufferSize)
-{
-  TCHAR *sp, *ep;
-  int len, idx, isstring;
-  TCHAR LocalBuffer[INI_BUFFERSIZE];
-
-  assert(fp != NULL);
-  /* Move through file 1 line at a time until a section is matched or EOF. If
-   * parameter Section is NULL, only look at keys above the first section. If
-   * idxSection is postive, copy the relevant section name.
-   */
-  len = (Section != NULL) ? _tcslen(Section) : 0;
-  if (len > 0 || idxSection >= 0) {
-    idx = -1;
-    do {
-      if (!ini_read(LocalBuffer, INI_BUFFERSIZE, fp))
-        return 0;
-      sp = skipleading(LocalBuffer);
-      ep = _tcschr(sp, ']');
-    } while (*sp != '[' || ep == NULL || (((int)(ep-sp-1) != len || _tcsnicmp(sp+1,Section,len) != 0) && ++idx != idxSection));
-    if (idxSection >= 0) {
-      if (idx == idxSection) {
-        assert(ep != NULL);
-        assert(*ep == ']');
-        *ep = '\0';
-        save_strncpy(Buffer, sp + 1, BufferSize, QUOTE_NONE);
-        return 1;
-      } /* if */
-      return 0; /* no more section found */
-    } /* if */
-  } /* if */
-
-  /* Now that the section has been found, find the entry.
-   * Stop searching upon leaving the section's area.
-   */
-  assert(Key != NULL || idxKey >= 0);
-  len = (Key != NULL) ? (int)_tcslen(Key) : 0;
-  idx = -1;
-  do {
-    if (!ini_read(LocalBuffer,INI_BUFFERSIZE,fp) || *(sp = skipleading(LocalBuffer)) == '[')
-      return 0;
-    sp = skipleading(LocalBuffer);
-    ep = _tcschr(sp, '='); /* Parse out the equal sign */
-    if (ep == NULL)
-      ep = _tcschr(sp, ':');
-  } while (*sp == ';' || *sp == '#' || ep == NULL || (((int)(skiptrailing(ep,sp)-sp) != len || _tcsnicmp(sp,Key,len) != 0) && ++idx != idxKey));
-  if (idxKey >= 0) {
-    if (idx == idxKey) {
-      assert(ep != NULL);
-      assert(*ep == '=' || *ep == ':');
-      *ep = '\0';
-      striptrailing(sp);
-      save_strncpy(Buffer, sp, BufferSize, QUOTE_NONE);
-      return 1;
-    } /* if */
-    return 0;   /* no more key found (in this section) */
-  } /* if */
-
-  /* Copy up to BufferSize chars to buffer */
-  assert(ep != NULL);
-  assert(*ep == '=' || *ep == ':');
-  sp = skipleading(ep + 1);
-  /* Remove a trailing comment */
-  isstring = 0;
-  for (ep = sp; *ep != '\0' && ((*ep != ';' && *ep != '#') || isstring); ep++) {
-    if (*ep == '"') {
-      if (*(ep + 1) == '"')
-        ep++;                 /* skip "" (both quotes) */
-      else
-        isstring = !isstring; /* single quote, toggle isstring */
-    } else if (*ep == '\\' && *(ep + 1) == '"') {
-      ep++;                   /* skip \" (both quotes */
-    } /* if */
-  } /* for */
-  assert(ep != NULL && (*ep == '\0' || *ep == ';' || *ep == '#'));
-  *ep = '\0';                 /* terminate at a comment */
-  striptrailing(sp);
-  /* Remove double quotes surrounding a value */
-  isstring = QUOTE_NONE;
-  if (*sp == '"' && (ep = _tcschr(sp, '\0')) != NULL && *(ep - 1) == '"') {
-    sp++;
-    *--ep = '\0';
-    isstring = QUOTE_DEQUOTE; /* this is a string, so remove escaped characters */
-  } /* if */
-  save_strncpy(Buffer, sp, BufferSize, isstring);
-  return 1;
-}
-
-/** ini_gets()
- * \param Section     the name of the section to search for
- * \param Key         the name of the entry to find the value of
- * \param DefValue    default string in the event of a failed read
- * \param Buffer      a pointer to the buffer to copy into
- * \param BufferSize  the maximum number of characters to copy
- * \param Filename    the name and full path of the .ini file to read from
- *
- * \return            the number of characters copied into the supplied buffer
- */
-int ini_gets(const TCHAR *Section, const TCHAR *Key, const TCHAR *DefValue,
-             TCHAR *Buffer, int BufferSize, const TCHAR *Filename)
-{
-  INI_FILETYPE fp;
-  int ok = 0;
-
-  if (Buffer == NULL || BufferSize <= 0 || Key == NULL)
-    return 0;
-  if (ini_openread(Filename, &fp)) {
-    ok = getkeystring(&fp, Section, Key, -1, -1, Buffer, BufferSize);
-    ini_close(&fp);
-  } /* if */
-  if (!ok)
-    save_strncpy(Buffer, DefValue, BufferSize, QUOTE_NONE);
-  return _tcslen(Buffer);
-}
-
-/** ini_getl()
- * \param Section     the name of the section to search for
- * \param Key         the name of the entry to find the value of
- * \param DefValue    the default value in the event of a failed read
- * \param Filename    the name of the .ini file to read from
- *
- * \return            the value located at Key
- */
-long ini_getl(const TCHAR *Section, const TCHAR *Key, long DefValue, const TCHAR *Filename)
-{
-  TCHAR buff[64];
-  int len = ini_gets(Section, Key, __T(""), buff, sizearray(buff), Filename);
-  return (len == 0) ? DefValue : _tcstol(buff,NULL,10);
-}
-
-/** ini_getsection()
- * \param idx         the zero-based sequence number of the section to return
- * \param Buffer      a pointer to the buffer to copy into
- * \param BufferSize  the maximum number of characters to copy
- * \param Filename    the name and full path of the .ini file to read from
- *
- * \return            the number of characters copied into the supplied buffer
- */
-int  ini_getsection(int idx, TCHAR *Buffer, int BufferSize, const TCHAR *Filename)
-{
-  INI_FILETYPE fp;
-  int ok = 0;
-
-  if (Buffer == NULL || BufferSize <= 0 || idx < 0)
-    return 0;
-  if (ini_openread(Filename, &fp)) {
-    ok = getkeystring(&fp, NULL, NULL, idx, -1, Buffer, BufferSize);
-    ini_close(&fp);
-  } /* if */
-  if (!ok)
-    *Buffer = '\0';
-  return _tcslen(Buffer);
-}
-
-/** ini_getkey()
- * \param Section     the name of the section to browse through, or NULL to
- *                    browse through the keys outside any section
- * \param idx         the zero-based sequence number of the key to return
- * \param Buffer      a pointer to the buffer to copy into
- * \param BufferSize  the maximum number of characters to copy
- * \param Filename    the name and full path of the .ini file to read from
- *
- * \return            the number of characters copied into the supplied buffer
- */
-int  ini_getkey(const TCHAR *Section, int idx, TCHAR *Buffer, int BufferSize, const TCHAR *Filename)
-{
-  INI_FILETYPE fp;
-  int ok = 0;
-
-  if (Buffer == NULL || BufferSize <= 0 || idx < 0)
-    return 0;
-  if (ini_openread(Filename, &fp)) {
-    ok = getkeystring(&fp, Section, NULL, -1, idx, Buffer, BufferSize);
-    ini_close(&fp);
-  } /* if */
-  if (!ok)
-    *Buffer = '\0';
-  return _tcslen(Buffer);
-}
-
-
-#if ! defined INI_READONLY
-static void ini_tempname(TCHAR *dest, const TCHAR *source, int maxlength)
-{
-  TCHAR *p;
-
-  save_strncpy(dest, source, maxlength, QUOTE_NONE);
-  p = _tcsrchr(dest, '\0');
-  assert(p != NULL);
-  *(p - 1) = '~';
-}
-
-static enum quote_option check_enquote(const TCHAR *Value)
-{
-  const TCHAR *p;
-
-  /* run through the value, if it has trailing spaces, or '"', ';' or '#'
-   * characters, enquote it
-   */
-  assert(Value != NULL);
-  for (p = Value; *p != '\0' && *p != '"' && *p != ';' && *p != '#'; p++)
-    /* nothing */;
-  return (*p != '\0' || (p > Value && *(p - 1) == ' ')) ? QUOTE_ENQUOTE : QUOTE_NONE;
-}
-
-static void writesection(TCHAR *LocalBuffer, const TCHAR *Section, INI_FILETYPE *fp)
-{
-  TCHAR *p;
-
-  if (Section != NULL && _tcslen(Section) > 0) {
-    LocalBuffer[0] = '[';
-    save_strncpy(LocalBuffer + 1, Section, INI_BUFFERSIZE - 4, QUOTE_NONE);  /* -1 for '[', -1 for ']', -2 for '\r\n' */
-    p = _tcsrchr(LocalBuffer, '\0');
-    assert(p != NULL);
-    *p++ = ']';
-    _tcscpy(p, INI_LINETERM); /* copy line terminator (typically "\n") */
-    ini_write(LocalBuffer, fp);
-  } /* if */
-}
-
-static void writekey(TCHAR *LocalBuffer, const TCHAR *Key, const TCHAR *Value, INI_FILETYPE *fp)
-{
-  TCHAR *p;
-  enum quote_option option = check_enquote(Value);
-  save_strncpy(LocalBuffer, Key, INI_BUFFERSIZE - 3, QUOTE_NONE);  /* -1 for '=', -2 for '\r\n' */
-  p = _tcsrchr(LocalBuffer, '\0');
-  assert(p != NULL);
-  *p++ = '=';
-  save_strncpy(p, Value, INI_BUFFERSIZE - (p - LocalBuffer) - 2, option); /* -2 for '\r\n' */
-  p = _tcsrchr(LocalBuffer, '\0');
-  assert(p != NULL);
-  _tcscpy(p, INI_LINETERM); /* copy line terminator (typically "\n") */
-  ini_write(LocalBuffer, fp);
-}
-
-static void write_quoted(const TCHAR *Value, INI_FILETYPE *fp)
-{
-  TCHAR s[3];
-  int idx;
-  if (check_enquote(Value) == QUOTE_NONE) {
-    ini_write(Value, fp);
-  } else {
-    ini_write("\"", fp);
-    for (idx = 0; Value[idx] != '\0'; idx++) {
-      if (Value[idx] == '"') {
-        s[0] = '\\';
-        s[1] = Value[idx];
-        s[2] = '\0';
-      } else {
-        s[0] = Value[idx];
-        s[1] = '\0';
-      } /* if */
-      ini_write(s, fp);
-    } /* for */
-    ini_write("\"", fp);
-  } /* if */
-}
-
-/** ini_puts()
- * \param Section     the name of the section to write the string in
- * \param Key         the name of the entry to write, or NULL to erase all keys in the section
- * \param Value       a pointer to the buffer the string, or NULL to erase the key
- * \param Filename    the name and full path of the .ini file to write to
- *
- * \return            1 if successful, otherwise 0
- */
-int ini_puts(const TCHAR *Section, const TCHAR *Key, const TCHAR *Value, const TCHAR *Filename)
-{
-  INI_FILETYPE rfp;
-  INI_FILETYPE wfp;
-  TCHAR *sp, *ep;
-  TCHAR LocalBuffer[INI_BUFFERSIZE];
-  int len, match, count;
-
-  assert(Filename!=NULL);
-  if (!ini_openread(Filename, &rfp)) {
-    /* If the .ini file doesn't exist, make a new file */
-    if (Key!=NULL && Value!=NULL) {
-      if (!ini_openwrite(Filename, &wfp))
-        return 0;
-      writesection(LocalBuffer, Section, &wfp);
-      writekey(LocalBuffer, Key, Value, &wfp);
-      ini_close(&wfp);
-    } /* if */
-    return 1;
-  } /* if */
-
-  /* If parameters Key and Value are valid (so this is not an "erase" request)
-   * and the setting already exists and it already has the correct value, do
-   * nothing. This early bail-out avoids rewriting the INI file for no reason.
-   */
-  if (Key!=NULL && Value!=NULL) {
-    match = getkeystring(&rfp, Section, Key, -1, -1, LocalBuffer, sizearray(LocalBuffer));
-    if (match && _tcscmp(LocalBuffer,Value)==0) {
-      ini_close(&rfp);
-      return 1;
-    } /* if */
-    /* key not found, or different value -> proceed (but rewind the input file first) */
-    ini_rewind(&rfp);
-  } /* if */
-
-  /* Get a temporary file name to copy to. Use the existing name, but with
-   * the last character set to a '~'.
-   */
-  ini_tempname(LocalBuffer, Filename, INI_BUFFERSIZE);
-  if (!ini_openwrite(LocalBuffer, &wfp)) {
-    ini_close(&rfp);
-    return 0;
-  } /* if */
-
-  /* Move through the file one line at a time until a section is
-   * matched or until EOF. Copy to temp file as it is read.
-   */
-  count = 0;
-  len = (Section != NULL) ? _tcslen(Section) : 0;
-  if (len > 0) {
-    do {
-      if (!ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp)) {
-        /* Failed to find section, so add one to the end */
-        if (Key!=NULL && Value!=NULL) {
-            ini_write(INI_LINETERM, &wfp);  /* force a new line (there may not have been one) behind the last line of the INI file */
-            writesection(LocalBuffer, Section, &wfp);
-            writekey(LocalBuffer, Key, Value, &wfp);
-        } /* if */
-        /* Clean up and rename */
-        ini_close(&rfp);
-        ini_close(&wfp);
-        ini_remove(Filename);
-        ini_tempname(LocalBuffer, Filename, INI_BUFFERSIZE);
-        ini_rename(LocalBuffer, Filename);
-        return 1;
-      } /* if */
-      /* Copy the line from source to dest, but not if this is the section that
-       * we are looking for and this section must be removed
-       */
-      sp = skipleading(LocalBuffer);
-      ep = _tcschr(sp, ']');
-      match = (*sp == '[' && ep != NULL && (int)(ep-sp-1) == len && _tcsnicmp(sp + 1,Section,len) == 0);
-      if (!match || Key!=NULL) {
-        /* Remove blank lines, but insert a blank line (possibly one that was
-         * removed on the previous iteration) before a new section. This creates
-         * "neat" INI files.
-         */
-        if (_tcslen(sp) > 0) {
-          if (*sp == '[' && count > 0)
-            ini_write(INI_LINETERM, &wfp);
-          ini_write(sp, &wfp);
-          count++;
-        } /* if */
-      } /* if */
-    } while (!match);
-  } /* if */
-
-  /* Now that the section has been found, find the entry. Stop searching
-   * upon leaving the section's area. Copy the file as it is read
-   * and create an entry if one is not found.
-   */
-  len = (Key!=NULL) ? _tcslen(Key) : 0;
-  for( ;; ) {
-    if (!ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp)) {
-      /* EOF without an entry so make one */
-      if (Key!=NULL && Value!=NULL) {
-          ini_write(INI_LINETERM, &wfp);  /* force a new line (there may not have been one) behind the last line of the INI file */
-          writekey(LocalBuffer, Key, Value, &wfp);
-      } /* if */
-      /* Clean up and rename */
-      ini_close(&rfp);
-      ini_close(&wfp);
-      ini_remove(Filename);
-      ini_tempname(LocalBuffer, Filename, INI_BUFFERSIZE);
-      ini_rename(LocalBuffer, Filename);
-      return 1;
-    } /* if */
-    sp = skipleading(LocalBuffer);
-    ep = _tcschr(sp, '='); /* Parse out the equal sign */
-    if (ep == NULL)
-      ep = _tcschr(sp, ':');
-    match = (ep != NULL && (int)(skiptrailing(ep,sp)-sp) == len && _tcsnicmp(sp,Key,len) == 0);
-    if ((Key!=NULL && match) || *sp == '[')
-      break;  /* found the key, or found a new section */
-    /* in the section that we re-write, do not copy empty lines */
-    if (Key!=NULL && _tcslen(sp) > 0)
-      ini_write(sp, &wfp);
-  } /* for */
-  if (*sp == '[') {
-    /* found start of new section, the key was not in the specified
-     * section, so we add it just before the new section
-     */
-    if (Key!=NULL && Value!=NULL) {
-      /* We cannot use "writekey()" here, because we need to preserve the
-       * contents of LocalBuffer.
-       */
-      ini_write(Key, &wfp);
-      ini_write("=", &wfp);
-      write_quoted(Value, &wfp);
-      ini_write(INI_LINETERM INI_LINETERM, &wfp); /* put a blank line between the current and the next section */
-    } /* if */
-    /* write the new section header that we read previously */
-    ini_write(sp, &wfp);
-  } else {
-    /* We found the key; ignore the line just read (with the key and
-     * the current value) and write the key with the new value.
-     */
-    if (Key!=NULL && Value!=NULL)
-      writekey(LocalBuffer, Key, Value, &wfp);
-  } /* if */
-  /* Copy the rest of the INI file (removing empty lines, except before a section) */
-  while (ini_read(LocalBuffer, INI_BUFFERSIZE, &rfp)) {
-    sp = skipleading(LocalBuffer);
-    if (_tcslen(sp) > 0) {
-      if (*sp == '[')
-        ini_write(INI_LINETERM, &wfp);
-      ini_write(sp, &wfp);
-    } /* if */
-  } /* while */
-  /* Clean up and rename */
-  ini_close(&rfp);
-  ini_close(&wfp);
-  ini_remove(Filename);
-  ini_tempname(LocalBuffer, Filename, INI_BUFFERSIZE);
-  ini_rename(LocalBuffer, Filename);
-  return 1;
-}
-
-/* Ansi C "itoa" based on Kernighan & Ritchie's "Ansi C" book. */
-#define ABS(v)  ((v) < 0 ? -(v) : (v))
-
-static void strreverse(TCHAR *str)
-{
-  TCHAR t;
-  int i, j;
-
-  for (i = 0, j = _tcslen(str) - 1; i < j; i++, j--) {
-    t = str[i];
-    str[i] = str[j];
-    str[j] = t;
-  } /* for */
-}
-
-static void long2str(long value, TCHAR *str)
-{
-  int i = 0;
-  long sign = value;
-  int n;
-
-  /* generate digits in reverse order */
-  do {
-    n = (int)(value % 10);              /* get next lowest digit */
-    str[i++] = (TCHAR)(ABS(n) + '0');   /* handle case of negative digit */
-  } while (value /= 10);                /* delete the lowest digit */
-  if (sign < 0)
-    str[i++] = '-';
-  str[i] = '\0';
-
-  strreverse(str);
-}
-
-/** ini_putl()
- * \param Section     the name of the section to write the value in
- * \param Key         the name of the entry to write, or NULL to erase all keys in the section
- * \param Value       the value to write
- * \param Filename    the name and full path of the .ini file to write to
- *
- * \return            1 if successful, otherwise 0
- */
-int ini_putl(const TCHAR *Section, const TCHAR *Key, long Value, const TCHAR *Filename)
-{
-  TCHAR str[32];
-  long2str(Value, str);
-  return ini_puts(Section, Key, str, Filename);
-}
-#endif /* !INI_READONLY */
-
-
-#if defined PORTABLE_STRNICMP
-int strnicmp(const TCHAR *s1, const TCHAR *s2, size_t n)
-{
-  register unsigned TCHAR c1, c2;
-
-  while (n-- != 0 && (*s1 || *s2)) {
-    c1 = *(const unsigned TCHAR *)s1++;
-    if ('a' <= c1 && c1 <= 'z')
-      c1 += ('A' - 'a');
-    c2 = *(const unsigned TCHAR *)s2++;
-    if ('a' <= c2 && c2 <= 'z')
-      c2 += ('A' - 'a');
-    if (c1 != c2)
-      return c1 - c2;
-  } /* while */
-  return 0;
-}
-#endif /* PORTABLE_STRNICMP */
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minIni.h b/flight/PiOS/STM32F10x/Libraries/minIni/minIni.h
deleted file mode 100644
index 096fa51bc..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/minIni.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  minIni - Multi-Platform INI file parser, suitable for embedded systems
- *
- *  Copyright (c) ITB CompuPhase, 2008-2009
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
- *  use this file except in compliance with the License. You may obtain a copy
- *  of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- *  License for the specific language governing permissions and limitations
- *  under the License.
- *
- *  Version: $Id: minIni.h 24 2009-05-06 08:01:53Z thiadmer.riemersma $
- */
-#ifndef MININI_H
-#define MININI_H
-
-#include "minGlue.h"
-
-#if (defined _UNICODE || defined __UNICODE__ || defined UNICODE) && !defined INI_ANSIONLY
-  #include <tchar.h>
-#elif !defined __T
-  typedef char TCHAR;
-#endif
-
-#if !defined INI_BUFFERSIZE
-  #define INI_BUFFERSIZE  512
-#endif
-
-#if defined __cplusplus
-  extern "C" {
-#endif
-
-long ini_getl(const TCHAR *Section, const TCHAR *Key, long DefValue, const TCHAR *Filename);
-int  ini_gets(const TCHAR *Section, const TCHAR *Key, const TCHAR *DefValue, TCHAR *Buffer, int BufferSize, const TCHAR *Filename);
-int  ini_putl(const TCHAR *Section, const TCHAR *Key, long Value, const TCHAR *Filename);
-int  ini_puts(const TCHAR *Section, const TCHAR *Key, const TCHAR *Value, const TCHAR *Filename);
-int  ini_getsection(int idx, TCHAR *Buffer, int BufferSize, const TCHAR *Filename);
-int  ini_getkey(const TCHAR *Section, int idx, TCHAR *Buffer, int BufferSize, const TCHAR *Filename);
-
-#if defined __cplusplus
-  }
-#endif
-
-#if defined __cplusplus
-#include <string>
-
-/* The C++ class in minIni.h was contributed by Steven Van Ingelgem. */
-class minIni
-{
-public:
-  minIni(const std::string& filename) : iniFilename(filename)
-    { }
-
-  long getl(const std::string& Section, const std::string& Key, long DefValue=0) const
-    { return ini_getl(Section.c_str(), Key.c_str(), DefValue, iniFilename.c_str()); }
-
-  long geti(const std::string& Section, const std::string& Key, int DefValue=0) const
-    { return reinterpret_cast<int>( this->getl(Section, Key, DefValue) ); }
-
-  std::string gets(const std::string& Section, const std::string& Key, const std::string& DefValue="") const
-    {
-      char buffer[INI_BUFFERSIZE];
-      ini_gets(Section.c_str(), Key.c_str(), DefValue.c_str(), buffer, INI_BUFFERSIZE, iniFilename.c_str());
-      return buffer;
-    }
-
-  bool put(const std::string& Section, const std::string& Key, long Value) const
-    { return ini_putl(Section.c_str(), Key.c_str(), Value, iniFilename.c_str()); }
-
-  bool put(const std::string& Section, const std::string& Key, const std::string& Value) const
-    { return ini_puts(Section.c_str(), Key.c_str(), Value.c_str(), iniFilename.c_str()); }
-
-private:
-    std::string iniFilename;
-};
-
-#endif /* __cplusplus */
-
-#endif /* MININI_H */
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/minIni.pdf b/flight/PiOS/STM32F10x/Libraries/minIni/minIni.pdf
deleted file mode 100644
index 88f487b45..000000000
Binary files a/flight/PiOS/STM32F10x/Libraries/minIni/minIni.pdf and /dev/null differ
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/test.c b/flight/PiOS/STM32F10x/Libraries/minIni/test.c
deleted file mode 100644
index cd4cd8183..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/test.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Simple test program
- *
- * wcl386 -wx -d2 -q test.c minini.c
- */
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include "minIni.h"
-
-#define sizearray(a)  (sizeof(a) / sizeof((a)[0]))
-
-const char inifile[] = "test.ini";
-
-int main(void)
-{
-  char str[100];
-  long n;
-  int s, k;
-  char section[50];
-
-  /* string reading */
-  n = ini_gets("first", "string", "aap", str, sizearray(str), inifile);
-  assert(n==4 && strcmp(str,"noot")==0);
-  n = ini_gets("second", "string", "aap", str, sizearray(str), inifile);
-  assert(n==4 && strcmp(str,"mies")==0);
-  n = ini_gets("first", "dummy", "aap", str, sizearray(str), inifile);
-  assert(n==3 && strcmp(str,"aap")==0);
-  printf("1. String reading tests passed\n");
-
-  /* value reading */
-  n = ini_getl("first", "val", -1, inifile);
-  assert(n==1);
-  n = ini_getl("second", "val", -1, inifile);
-  assert(n==2);
-  n = ini_getl("first", "dummy", -1, inifile);
-  assert(n==-1);
-  printf("2. Value reading tests passed\n");
-
-  /* string writing */
-  n = ini_puts("first", "alt", "flagged as \"correct\"", inifile);
-  assert(n==1);
-  n = ini_gets("first", "alt", "aap", str, sizearray(str), inifile);
-  assert(n==20 && strcmp(str,"flagged as \"correct\"")==0);
-  /* ----- */
-  n = ini_puts("second", "alt", "correct", inifile);
-  assert(n==1);
-  n = ini_gets("second", "alt", "aap", str, sizearray(str), inifile);
-  assert(n==7 && strcmp(str,"correct")==0);
-  /* ----- */
-  n = ini_puts("third", "alt", "correct", inifile);
-  assert(n==1);
-  n = ini_gets("third", "alt", "aap", str, sizearray(str), inifile);
-  assert(n==7 && strcmp(str,"correct")==0);
-  /* ----- */
-  printf("3. String writing tests passed\n");
-
-  /* section/key enumeration */
-  for (s = 0; ini_getsection(s, section, sizearray(section), inifile) > 0; s++) {
-    printf("[%s]\n", section);
-    for (k = 0; ini_getkey(section, k, str, sizearray(str), inifile) > 0; k++) {
-      printf("\t%s\n", str);
-    } /* for */
-  } /* for */
-
-  /* string deletion */
-  n = ini_puts("first", "alt", NULL, inifile);
-  assert(n==1);
-  n = ini_puts("second", "alt", NULL, inifile);
-  assert(n==1);
-  n = ini_puts("third", NULL, NULL, inifile);
-  assert(n==1);
-
-  return 0;
-}
-
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/test.ini b/flight/PiOS/STM32F10x/Libraries/minIni/test.ini
deleted file mode 100644
index 131fbdde8..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/test.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[First]
-String=noot # trailing commment
-Val=1
-
-[Second]
-Val = 2
-String = mies
-#comment=3
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/test_settings.ini b/flight/PiOS/STM32F10x/Libraries/minIni/test_settings.ini
deleted file mode 100644
index 2f10defba..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/test_settings.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Test ini-File for minIni with FatFs on STM32
-#
-
-[Meta]
-Version=0.0.1
-Author=Erwin Lindemann
-
-[Motor]
-RPM_max=4000
-IGN_time1=123
-IGN_time2=543
-
-[Regulator1]
-Kp=10
-Ki=11
-Kd=12
-Limit_max=200
-Limit_min=100
-
diff --git a/flight/PiOS/STM32F10x/Libraries/minIni/wxMinIni.h b/flight/PiOS/STM32F10x/Libraries/minIni/wxMinIni.h
deleted file mode 100644
index 51609f959..000000000
--- a/flight/PiOS/STM32F10x/Libraries/minIni/wxMinIni.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef WXMININI_H
-#define WXMININI_H
-
-#include <wx/wx.h>
-#include "minini.h"
-
-#if defined __linux || defined __linux__ || defined __LINUX__ \
-    || defined FREEBSD || defined __FreeBSD__ || defined __OpenBSD__
-  #define DIRSEP_CHAR     '/'
-  #define DIRSEP_STR      "/"
-#else
-  #define DIRSEP_CHAR     '\\'
-  #define DIRSEP_STR      "\\"
-#endif
-
-class minIni {
-public:
-    minIni(const wxString& name, const wxString& path=wxT(""))
-        {
-        if (path.Len() > 0)
-            iniFilename = path;
-        else
-            iniFilename = wxGetCwd();
-        int len = iniFilename.Len();
-        if (len > 0 && iniFilename[len] != DIRSEP_CHAR)
-            iniFilename += wxT(DIRSEP_STR);
-        iniFilename += name;
-        }
-
-    long getl(const wxString& Section, const wxString& Key, long DefValue=0, const wxString& Filename=wxT(""))
-        {
-        wxString name = Filename.Len() > 0 ? Filename : iniFilename;
-        return ini_getl(Section.utf8_str(), Key.utf8_str(), DefValue, name.utf8_str());
-        }
-
-    int geti(const wxString& Section, const wxString& Key, int DefValue=0, const wxString& Filename=wxT(""))
-        {
-        wxString name = Filename.Len() > 0 ? Filename : iniFilename;
-        return (int)ini_getl(Section.utf8_str(), Key.utf8_str(), DefValue, name.utf8_str());
-        }
-
-    wxString gets(const wxString& Section, const wxString& Key, const wxString& DefValue=wxT(""), const wxString& Filename=wxT(""))
-        {
-        wxString name = Filename.Len() > 0 ? Filename : iniFilename;
-        char buffer[INI_BUFFERSIZE];
-        ini_gets(Section.utf8_str(), Key.utf8_str(), DefValue.utf8_str(), buffer, INI_BUFFERSIZE, name.utf8_str());
-        wxString result = wxString::FromUTF8(buffer);
-        return result;
-        }
-
-    bool put(const wxString& Section, const wxString& Key, long Value, const wxString& Filename=wxT(""))
-        {
-        wxString name = Filename.Len() > 0 ? Filename : iniFilename;
-        return ini_putl(Section.utf8_str(), Key.utf8_str(), Value, name.utf8_str());
-        }
-
-    bool put(const wxString& Section, const wxString& Key, int Value, const wxString& Filename=wxT(""))
-        {
-        wxString name = Filename.Len() > 0 ? Filename : iniFilename;
-        return ini_putl(Section.utf8_str(), Key.utf8_str(), Value, name.utf8_str());
-        }
-
-    bool put(const wxString& Section, const wxString& Key, const wxString& Value, const wxString& Filename=wxT(""))
-        {
-        wxString name = Filename.Len() > 0 ? Filename : iniFilename;
-        return ini_puts(Section.utf8_str(), Key.utf8_str(), Value.utf8_str(), name.utf8_str());
-        }
-
-private:
-    wxString iniFilename;
-};
-
-#endif /* WXMININI_H */
diff --git a/flight/PiOS/pios.h b/flight/PiOS/pios.h
index bfa83649c..141b0a395 100644
--- a/flight/PiOS/pios.h
+++ b/flight/PiOS/pios.h
@@ -54,9 +54,6 @@
 /* Dosfs Includes */
 #include <dosfs.h>
 
-/* minIni Includes */
-#include <minIni.h>
-
 /* Mass Storage Device Includes */
 #include <msd.h>
 #endif