diff --git a/docs/src/cfe_es.dox b/docs/src/cfe_es.dox
index dcaa7a28f..15500e9c5 100644
--- a/docs/src/cfe_es.dox
+++ b/docs/src/cfe_es.dox
@@ -6,8 +6,7 @@
   high level interface to system control facilities. The ES component is 
   responsible for starting up and restarting the cFE, starting up, shutting 
   down, and restarting cFE Applications, logging errors and performance data, 
-  managing device driver services, and providing a persistent memory store 
-  for cFE Applications.  
+  and providing a persistent memory store for cFE Applications.  
 
   The interfaces to the ES task include the Ground Interface (commands and 
   telemetry) and the Application Programmer Interfaces (APIs). The ES task 
diff --git a/docs/src/main.dox b/docs/src/main.dox
index 656548102..7468f1b04 100644
--- a/docs/src/main.dox
+++ b/docs/src/main.dox
@@ -493,11 +493,6 @@
       <LI> #CFE_ES_DeleteChildTask - Deletes a task under an existing Application
       <LI> #CFE_ES_ExitChildTask - Exit for a cFE Child Task
     </UL>
-    <LI> Driver APIs
-    <UL>
-      <LI> \#CFE_ES_RegisterDriver - Registers a Device Driver for a specified device
-      <LI> \#CFE_ES_UnloadDriver - Removes a Device Driver for a specified device
-    </UL>
     <LI> Critical Data Store APIs
     <UL>
       <LI> #CFE_ES_RegisterCDS - Reserves space (or obtains previously reserved space)in the Critical Data Store
diff --git a/fsw/cfe-core/src/es/cfe_es_apps.c b/fsw/cfe-core/src/es/cfe_es_apps.c
index 68cf0cbfd..a23e9d9ae 100644
--- a/fsw/cfe-core/src/es/cfe_es_apps.c
+++ b/fsw/cfe-core/src/es/cfe_es_apps.c
@@ -335,10 +335,6 @@ int32 CFE_ES_ParseFileEntry(const char **TokenList, uint32 NumTokens)
                                EntryPoint, AppName);
 
    }
-   else if(strcmp(EntryType,"CFE_DRV")==0)
-   { 
-      CFE_ES_WriteToSysLog("ES Startup: Device Drivers not yet implemented. %s\n",FileName);
-   }
    else
    {
       CFE_ES_WriteToSysLog("ES Startup: Unexpected EntryType %s in startup file.\n",EntryType);
diff --git a/fsw/cfe-core/unit-test/es_UT.c b/fsw/cfe-core/unit-test/es_UT.c
index 1668a0a35..09c366e92 100644
--- a/fsw/cfe-core/unit-test/es_UT.c
+++ b/fsw/cfe-core/unit-test/es_UT.c
@@ -908,26 +908,6 @@ void TestApps(void)
               "CFE_ES_StartApplications",
               "Start application; successful");
 
-    /* Test parsing the startup script with an invalid CFE driver type */
-    ES_ResetUnitTest();
-    {
-        const char *TokenList[] =
-        {
-                "CFE_DRV",
-                "/cf/apps/tst_lib.bundle",
-                "TST_LIB_Init",
-                "TST_LIB",
-                "0",
-                "0",
-                "0x0",
-                "1"
-        };
-        UT_Report(__FILE__, __LINE__,
-                  CFE_ES_ParseFileEntry(TokenList, 8) == CFE_ES_ERR_APP_CREATE,
-                  "CFE_ES_ParseFileEntry",
-                  "Unimplemented CFE driver type");
-    }
-
     /* Test parsing the startup script with an unknown entry type */
     ES_ResetUnitTest();
     {
@@ -7062,15 +7042,6 @@ void TestStaticApp(void)
               "CFE_ES_StartStaticApplications",
               "*Not implemented* Initialize static shared library; successful");
 
-    /* Test successful device driver initialization */
-    ES_ResetUnitTest();
-    CFE_ES_StaticStartupTable[0].ObjectType = CFE_ES_STATIC_DRV;
-    CFE_ES_StartStaticApplications(CFE_PSP_RST_TYPE_PROCESSOR);
-    UT_Report(__FILE__, __LINE__,
-              UT_PrintfIsInHistory(UT_OSP_MESSAGES[UT_OSP_NO_MESSAGE]),
-              "CFE_ES_StartStaticApplications",
-              "*Not implemented* Device drivers not yet implemented");
-
     /* Test successful static application initialization null action */
     ES_ResetUnitTest();
     CFE_ES_StaticStartupTable[0].ObjectType = CFE_ES_STATIC_NULL;
diff --git a/fsw/cfe-core/unit-test/es_UT.h b/fsw/cfe-core/unit-test/es_UT.h
index 6784794ed..4d302cf81 100644
--- a/fsw/cfe-core/unit-test/es_UT.h
+++ b/fsw/cfe-core/unit-test/es_UT.h
@@ -257,13 +257,12 @@ void TestPerf(void);
 ** \sa #CFE_ES_RegisterApp, #CFE_ES_GetAppID, #CFE_ES_GetAppName
 ** \sa #CFE_ES_GetTaskInfo, #CFE_ES_CreateChildTask, #CFE_ES_DeleteChildTask
 ** \sa #CFE_ES_ExitChildTask, #CFE_ES_RegisterChildTask, #CFE_ES_WriteToSysLog
-** \sa #CFE_ES_RegisterDriver, #CFE_ES_UnloadDriver, #CFE_ES_CalculateCRC
+** \sa #CFE_ES_CalculateCRC, #CFE_ES_WaitForStartupSync, #CFE_ES_ProcessCoreException
 ** \sa #UT_SetBSPFail, #CFE_ES_RegisterCDS, #CFE_ES_CopyToCDS
 ** \sa #CFE_ES_RestoreFromCDS, #CFE_ES_LockSharedData, #CFE_ES_UnlockSharedData
 ** \sa #CFE_ES_RegisterGenCounter, #CFE_ES_GetGenCounterIDByName
 ** \sa #CFE_ES_DeleteGenCounter, #CFE_ES_IncrementGenCounter
-** \sa #CFE_ES_GetGenCount, #CFE_ES_SetGenCount, #CFE_ES_ProcessCoreException
-** \sa #CFE_ES_WaitForStartupSync
+** \sa #CFE_ES_GetGenCount, #CFE_ES_SetGenCount
 **
 ******************************************************************************/
 void TestAPI(void);