diff --git a/source/shared_lib/include/util/string_utils.h b/source/shared_lib/include/util/string_utils.h
index 6d31d5e5..08a9c74d 100644
--- a/source/shared_lib/include/util/string_utils.h
+++ b/source/shared_lib/include/util/string_utils.h
@@ -600,7 +600,7 @@ namespace Shared { namespace Util {
 
 	/*!
 	** \brief Convert an UTF-8 String into a WideChar String
-	** \todo This class must be removed as soon as possible and is only here to prevent against
+	** \This class must be removed as soon as possible and is only here to prevent against
 	** stange bugs with the previous implementation
 	*/
 	struct WString
diff --git a/source/shared_lib/sources/feathery_ftp/ftpAccount.c b/source/shared_lib/sources/feathery_ftp/ftpAccount.c
index cabe03ac..e592894c 100644
--- a/source/shared_lib/sources/feathery_ftp/ftpAccount.c
+++ b/source/shared_lib/sources/feathery_ftp/ftpAccount.c
@@ -69,7 +69,7 @@ int ftpDeleteAccount(const char* name)
  *  The translated path depends on the current working directory of the
  *  session and the root path of the session. In addition the path will
  *  be normalized.
- *  @todo normalize root and check if normalized path really exists
+ *  normalize root and check if normalized path really exists
  *
  *  @param name    user name
  *  @param passw   account password
diff --git a/source/shared_lib/sources/feathery_ftp/ftpLib.c b/source/shared_lib/sources/feathery_ftp/ftpLib.c
index 99013a70..38c4a1cb 100644
--- a/source/shared_lib/sources/feathery_ftp/ftpLib.c
+++ b/source/shared_lib/sources/feathery_ftp/ftpLib.c
@@ -75,7 +75,7 @@ void ftpRemoveDoubleSlash(char* path)
  *  The function catenates all passed strings to a new string and assures that  
  *  the result does not exceed MAX_PATH_LEN. The last parameter has to be
  *  NULL.
- *  @todo Not all embedded environments support variadic functions, or they are
+ *  Not all embedded environments support variadic functions, or they are
  *  too expensive. 
  *
  *  @param dest    user name
diff --git a/source/shared_lib/sources/feathery_ftp/ftpRuntime.c b/source/shared_lib/sources/feathery_ftp/ftpRuntime.c
index ca2bd663..f30c3a73 100644
--- a/source/shared_lib/sources/feathery_ftp/ftpRuntime.c
+++ b/source/shared_lib/sources/feathery_ftp/ftpRuntime.c
@@ -123,7 +123,6 @@ if(VERBOSE_MODE_ENABLED) printf("Server passive port successfully started\n");
  *  In order of avoid blocking of ftpExecute this function can be used to
  *  determine if the server has something to do. You can call this function in
  *  a loop and everytime it returns nonezero its time to call ftpExecute().
- *  @todo implement me
  *
  *  @return 0 noting to do; else server has received some data
  */
diff --git a/source/shared_lib/sources/feathery_ftp/ftpSession.c b/source/shared_lib/sources/feathery_ftp/ftpSession.c
index 1bfea53f..64d71479 100644
--- a/source/shared_lib/sources/feathery_ftp/ftpSession.c
+++ b/source/shared_lib/sources/feathery_ftp/ftpSession.c
@@ -323,7 +323,7 @@ if(VERBOSE_MODE_ENABLED) printf("ftpChangeDir path [%s] realPath [%s] NEW sessio
 }
 
 /**
- *  @todo documentation
+ *  Open an ftp transmission
  */
 void ftpOpenTransmission(int id, operation_E op, void* fsHandle, socket_t dataSocket, uint32_t fileSize)
 {
@@ -335,7 +335,7 @@ void ftpOpenTransmission(int id, operation_E op, void* fsHandle, socket_t dataSo
 }
 
 /**
- *  @todo documentation
+ *  Close an ftp transmission
  */
 void ftpCloseTransmission(int id)
 {
@@ -366,7 +366,7 @@ void ftpCloseTransmission(int id)
 }
 
 /**
- *  @todo documentation
+ *  Get the active transaction count
  */
 int ftpGetActiveTransCnt(void)
 {