diff --git a/README.md b/README.md
index fe1acb5..d160ab7 100644
--- a/README.md
+++ b/README.md
@@ -138,15 +138,19 @@ This app contains scripts for Windows and Linux forwarders that will move the ex
 Windows - `regenGUID.ps1`\
 \*Nix - `regenGUID.sh`
 
-###### Install updated datetime.xml file
-A notice was sent out in November of 2019 that stated there was an issue with the datetime.xml that would affect data ingested due to a misconfigured datetime.xml. The bug and fix can be read about here: https://docs.splunk.com/Documentation/Splunk/latest/ReleaseNotes/FixDatetimexml2020
+###### Install updated datetime.xml file (REMOVED)
+The scripts that performed this action have been retired. This method is also not the safest method to update this file and should not be used. It is preferable to simply upgrade Splunk version (Splunk Enterprise or Splunk Universal Forwarder) that already has this fix in place.
 
-This app contains scripts for Windows and Linux forwarders that will back up the existing "datetime.xml" to replace with the corrected version contained within the app.
+https://docs.splunk.com/Documentation/Splunk/latest/ReleaseNotes/FixDatetimexml2020#Upgrade_Splunk_platform_instances_to_a_version_with_an_updated_version_of_datetime.xml
 
-**NOTE: This should only be used on Universal Forwarders. Please see the above documentation link for instructions for other Splunk instances.**
+~~A notice was sent out in November of 2019 that stated there was an issue with the datetime.xml that would affect data ingested due to a misconfigured datetime.xml. The bug and fix can be read about here: https://docs.splunk.com/Documentation/Splunk/latest/ReleaseNotes/FixDatetimexml2020~~
 
-Windows - `dateTimeCorrect.ps1`\
-\*Nix - `dateTimeCorrect.sh`
+~~This app contains scripts for Windows and Linux forwarders that will back up the existing "datetime.xml" to replace with the corrected version contained within the app.~~
+
+~~**NOTE: This should only be used on Universal Forwarders. Please see the above documentation link for instructions for other Splunk instances.**~~
+
+~~Windows - `dateTimeCorrect.ps1`\
+\*Nix - `dateTimeCorrect.sh`~~
 
 ###### Update default 'changeme' password on Splunk Forwarders (primary installations before 7.1.0)
 Forwarders deployed before version 7.1.0 didn't require the admin password be changed upon installation. Starting at 7.1.0, the forwarders required either a user-seed file or manual input of the password during first-time run. While the REST API of the forwarder is not configured to allow POST requests until the password is changed on versions prior to 7.1.0, changing the password is still recommended.
diff --git a/bin/dateTimeCorrect.ps1 b/bin/dateTimeCorrect.ps1
deleted file mode 100644
index 2f36317..0000000
--- a/bin/dateTimeCorrect.ps1
+++ /dev/null
@@ -1,17 +0,0 @@
-### Capture current values for forwarder and configure file path variables for the system
-$existingDateTime = "$SPLUNKHOME\etc\datetime.xml"
-$referenceDateTime = "$SPLUNKHOME\apps\SplunkForwarderRepairKit\datetime.xml"
-$restartDateTimeCheck = "$SPLUNKHOME\etc\restartdatetime.txt"
-
-### Filter to attach timestamps where necessary
-filter timestamp {"$(Get-Date -Format 'yyyy-MM-dd HH:mm:ss.fff zzz') ${env:COMPUTERNAME}: $_"}
-
-### Check flags and take appropriate actions for host name
-if(Compare-Object -ReferenceObject $(Get-Content $existingDateTime) -DifferenceObject $(Get-Content $referenceDateTime)) {
-    Write-output "The datetime.xml file needs to be updated. Updating..." | timestamp
-    Copy-Item -Path "$existingDateTime" -Destination "$existingDateTime_$(Get-Date -Format 'MMddyyyy').bak"
-    Copy-Item -Path "$referenceDateTime" -Destination "$existingDateTime"
-    Out-File -FilePath "$restartDateTimeCheck"
-} else {
-    Write-output "The datetime.xml is the updated version. No correction necessary..."  | timestamp
-}
diff --git a/bin/dateTimeCorrect.sh b/bin/dateTimeCorrect.sh
deleted file mode 100755
index 26978fe..0000000
--- a/bin/dateTimeCorrect.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-### Determine the difference in the reference datetime.xml in the app and the datetime.xml currently used by Splunk
-EXISTING_DATETIME="$SPLUNK_HOME/etc/datetime.xml"
-REFERENCE_DATETIME="$SPLUNK_HOME/etc/apps/SplunkForwarderRepairKit/datetime.xml"
-DATETIME_DIFFERENCE=$(diff $REFERENCE_DATETIME $EXISTING_DATETIME | wc -l)
-RESTART_DATETIME_CHECK="$SPLUNK_HOME/etc/restartdatetime.txt"
-
-### Determine if a correction is necessary
-if [ $DATETIME_DIFFERENCE = 0 ]; then
-	echo "$(date -R) ${HOSTNAME}: The datetime.xml is the updated version. No correction necessary..."
-else
-	echo "$(date -R) ${HOSTNAME}: The datetime.xml file needs to be updated. Updating..."
-	mv $EXISTING_DATETIME $EXISTING_DATETIME.$(date +"%m%d%Y")
-	cp $REFERENCE_DATETIME $EXISTING_DATETIME
-	touch $RESTART_DATETIME_CHECK
-fi
diff --git a/bin/restart.ps1 b/bin/restart.ps1
index f89141a..131d778 100644
--- a/bin/restart.ps1
+++ b/bin/restart.ps1
@@ -3,17 +3,15 @@ $inputPath = "$SPLUNKHOME\etc\restartinput.txt"
 $serverPath = "$SPLUNKHOME\etc\restartserver.txt"
 $dsPath = "$SPLUNKHOME\etc\restartds.txt"
 $guidPath = "$SPLUNKHOME\etc\restartguid.txt"
-$dateTimePath = "$SPLUNKHOME\etc\restartdatetime.txt"
 $restartInput = $(Test-Path "$SPLUNKHOME\etc\restartinput.txt" -PathType Leaf)
 $restartServer = $(Test-Path "$SPLUNKHOME\etc\restartserver.txt" -PathType Leaf)
 $restartDS = $(Test-Path "$SPLUNKHOME\etc\restartds.txt" -PathType Leaf)
 $restartGUID = $(Test-Path "$SPLUNKHOME\etc\restartguid.txt" -PathType Leaf)
-$restartDateTime = $(Test-Path "$SPLUNKHOME\etc\restartdatetime.txt" -PathType Leaf)
 
 ### Filter to attach timestamps where necessary
 filter timestamp {"$(Get-Date -Format 'yyyy-MM-dd HH:mm:ss.fff zzz') ${env:COMPUTERNAME}: $_"}
 
-if ($restartInput -eq "True" -OR $restartServer -eq "True" -OR $restartDS -eq "True" -OR $restartGUID -eq "True" -OR $restartDateTime -eq "True") {
+if ($restartInput -eq "True" -OR $restartServer -eq "True" -OR $restartDS -eq "True" -OR $restartGUID -eq "True") {
 	Write-output "One or more settings has been changed." | timestamp
 	Write-output "Restarting forwarder." | timestamp
 	if ($restartInput -eq "True") {
@@ -28,9 +26,6 @@ if ($restartInput -eq "True" -OR $restartServer -eq "True" -OR $restartDS -eq "T
 	if ($restartGUID -eq "True") {
 		Remove-Item -path "$guidPath"
 	}
-	if ($restartDateTime -eq "True") {
-		Remove-Item -path "$dateTimePath"
-	}
 	Remove-Item -path "$PSScriptRoot\DeleteMeToRestart"
 } else {
 	Write-output "No settings have been changed." | timestamp
diff --git a/bin/restart.sh b/bin/restart.sh
index ecc62e3..6353545 100755
--- a/bin/restart.sh
+++ b/bin/restart.sh
@@ -7,10 +7,9 @@ RESTARTINPUT="$SPLUNK_HOME/etc/restartinput.txt"
 RESTARTSERVER="$SPLUNK_HOME/etc/restartserver.txt"
 RESTARTDS="$SPLUNK_HOME/etc/restartds.txt"
 RESTARTGUID="$SPLUNK_HOME/etc/restartguid.txt"
-RESTARTDATETIME="$SPLUNK_HOME/etc/restartdatetime.txt"
 
 ### If any files exist, restart forwarder
-if [ -f "$RESTARTINPUT" ] || [ -f "$RESTARTSERVER" ] || [ -f "$RESTARTDS" ] || [ -f "$RESTARTGUID" ] || [ -f "$RESTARTDATETIME" ]; then
+if [ -f "$RESTARTINPUT" ] || [ -f "$RESTARTSERVER" ] || [ -f "$RESTARTDS" ] || [ -f "$RESTARTGUID" ]; then
 	echo "$(date -R) ${HOSTNAME}: One or more settings has been changed."
 	echo "$(date -R) ${HOSTNAME}: Restarting forwarder."
 	if [ -f "$RESTARTINPUT" ]; then
@@ -25,9 +24,6 @@ if [ -f "$RESTARTINPUT" ] || [ -f "$RESTARTSERVER" ] || [ -f "$RESTARTDS" ] || [
 	if [ -f "$RESTARTGUID" ]; then
 		rm -f "$RESTARTGUID"
 	fi
-	if [ -f "$RESTARTDATETIME" ]; then
-		rm -f "$RESTARTDATETIME"
-	fi
 	rm -f "${APP_PATH}/bin/DeleteMeToRestart"
 else
 	echo "$(date -R) ${HOSTNAME}: No settings have been changed."
diff --git a/datetime.xml b/datetime.xml
deleted file mode 100644
index e7b2a82..0000000
--- a/datetime.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--   Version 4.0 -->
-
-<!-- datetime.xml -->
-<!-- This file contains the general formulas for parsing date/time formats. -->
-
-<datetime>
-
-<define name="_year" extract="year">
-	<text><![CDATA[(20\d\d|19\d\d|[9012]\d(?!\d))]]></text>
-</define>
-
-<define name="_month" extract="month">
-	<text><![CDATA[(0?[1-9]|1[012])(?!:)]]></text>
-</define>
-
-<define name="_litmonth"  extract="litmonth">
-	 <text><![CDATA[(?<![\d\w])(jan|\x{3127}\x{6708}|feb|\x{4E8C}\x{6708}|mar|\x{4E09}\x{6708}|apr|\x{56DB}\x{6708}|may|\x{4E94}\x{6708}|jun|\x{516D}\x{6708}|jul|\x{4E03}\x{6708}|aug|\x{516B}\x{6708}|sep|\x{4E5D}\x{6708}|oct|\x{5341}\x{6708}|nov|\x{5341}\x{3127}\x{6708}|dec|\x{5341}\x{4E8C}\x{6708})[a-z,\.;]*]]></text>
-</define>
-
-<define name="_allmonth" extract="litmonth, month">
-	<text><![CDATA[(?:]]></text>
-        <use name="_litmonth"/>
-	<text><![CDATA[|]]></text>
-        <use name="_month"/>
-	<text><![CDATA[)]]></text>
-</define>
-
-<define name="_day"  extract="day">
-	<text><![CDATA[(0?[1-9]|[12]\d|3[01])]]></text> 
-</define>
-
-<define name="_usday" extract="day">
-	<use name="_day"/>
-	<text><![CDATA[(?:st|nd|rd|th|[,\.;])?]]></text>
-</define>
-
-<define name="_hour" extract="hour">
-	<text><![CDATA[([01]?[0-9]|[012][0-3])(?!\d)]]></text>
-</define>
-
-<define name="_minute" extract="minute">
-	<text><![CDATA[([0-6]\d)(?!\d)]]></text>
-</define>
-
-<define name="_second" extract="second">
-	<text><![CDATA[([0-6]\d)(?!\d)]]></text>
-</define>
-
-<define name="_zone" extract="zone">
-	 <text><![CDATA[((?:(?:UT|UTC|GMT(?![+-])|CET|CEST|CETDST|MET|MEST|METDST|MEZ|MESZ|EET|EEST|EETDST|WET|WEST|WETDST|MSK|MSD|IST|JST|KST|HKT|AST|ADT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|CAST|CADT|EAST|EADT|WAST|WADT|Z)|(?:GMT)?[+-]\d\d?:?(?:\d\d)?)(?!\w))?]]></text>
-</define>
-
-<define name="_ampm" extract="ampm">
-	<text><![CDATA[([ap]m(?:[^A-Za-z0-9]|$)|[\x{4E0A}\x{4E0B}]\x{5348})?]]></text>
-</define>
-
-<define name="_time" extract="hour, minute, second, subsecond, ampm, zone">
-	<text><![CDATA[(?<!\d)]]></text>
-        <use name="_hour"/>
-	<text><![CDATA[:]]></text>
-        <use name="_minute"/>
-	<text><![CDATA[:]]></text>
-        <use name="_second"/> 
-	<text><![CDATA[(?:(?: \d{4})?[:,\.](\d+))? {0,2}]]></text>
-        <use name="_ampm"/>
-	<text><![CDATA[ {0,2}]]></text>
-        <use name="_zone"/>
-	<text><![CDATA[(?!:\d)]]></text>
-</define>
-
-<define name="_hmtime" extract="hour, minute, ampm">
-	<text><![CDATA[(?<!\d)]]></text>
-        <use name="_hour"/>
-	<text><![CDATA[:]]></text>
-        <use name="_minute"/>
-	<text><![CDATA[(?: ([ap]m(?:[^A-Za-z0-9]|$)|[\x{4E0A}\x{4E0B}]\x{5348}))?(?!:[:\d])]]></text>
-</define>
-
-
-<define name="_dottime" extract="hour, minute, second, subsecond, zone">
-	<text><![CDATA[(?<![\d\.])([01]\d|2[0-3])\.]]></text>
-        <use name="_minute"/>
-	<text><![CDATA[(?:\.?]]></text>
-        <use name="_second"/>
-	<text><![CDATA[(?:[:,]\d+)?(?:\.(\d\d\d\d+))?) {0,2}]]></text>
-        <use name="_zone"/>
-	<text><![CDATA[(?![0-9\.])]]></text>
-</define>
-
-<define name="_combdatetime" extract="year, month, day, hour, minute, second, subsecond">
-        <!-- ... 20060502-000002 GMT ... -->
-	<text><![CDATA[(?<![\d\.])(20\d\d)(0\d|1[012])([012]\d|3[01])[.-]?([01]\d|2[0123])([0-6]\d)([0-6]\d)(?:\.?(\d+))?]]>\s*</text>
-        <use name="_zone"/> 
-</define>
-
-<define name="_combdatetime2" extract="year, ignored_sep, month, day, hour, minute, second, zone">
-        <!-- ... 2007-3-22 0:0:2 GMT ...' -->
-        <!-- ... 2007/3/22 0:0:2 GMT ...' -->
-        <text><![CDATA[(?<![\d\.])(20\d\d)([-/])([01]?\d)\2([012]?\d|3[01])\s+([012]?\d):([0-6]?\d):([0-6]?\d)]]>\s*</text>
-        <use name="_zone"/> 
-</define>
-
-
-
-<define name="_usdate" extract="litmonth, month, ignored_sep, day, zone, ignored_sep2, year">
-	 <text><![CDATA[(?<!\w|\d[:\.\-])]]></text>
-	 <use name="_allmonth"/> 
-         <text><![CDATA[([/\- ]) {0,2}]]></text>
-         <use name="_day"/>
-         <text><![CDATA[(?!:) {0,2}(?:\d\d:\d\d:\d\d(?:[\.\,]\d+)? {0,2}]]></text>
-	 <use name="_zone"/>
-         <text><![CDATA[)?((?:\3|,) {0,2}]]></text>
-         <use name="_year"/> 
-         <text><![CDATA[)?(?!/|\w|\.\d)]]></text>
-</define>
-
-<!-- Jan 21, 09.  allows spaces with litmonth only -->
-<define name="_usdate1" extract="litmonth, ignored_sep, day, zone, ignored_sep2, year">
-	 <text><![CDATA[(?<!\w|\d[:\.\-])]]></text>
-	 <use name="_litmonth"/> 
-         <text><![CDATA[([/\- ]) {0,2}]]></text>
-         <use name="_day"/>
-         <text><![CDATA[(?!:) {0,2}(?:\d\d:\d\d:\d\d(?:[\.\,]\d+)? {0,2}]]></text>
-	 <use name="_zone"/>
-         <text><![CDATA[)?((?:\2|,) {0,2}]]></text>
-         <use name="_year"/> 
-         <text><![CDATA[)?(?!/|\w|\.\d)]]></text>
-</define>
-
-<!-- 10/21/09. doesn't allow spaces (e.g. 10 21 09) with numeric month -->
-<define name="_usdate2" extract="month, ignored_sep, day, zone, ignored_sep2, year">
-	 <text><![CDATA[(?<!\w|\d[:\.\-])]]></text>
-	 <use name="_month"/> 
-         <text><![CDATA[([/\-])]]></text>
-         <use name="_day"/>
-         <text><![CDATA[(?!:)(?:\d\d:\d\d:\d\d(?:[\.\,]\d+)? {0,2}]]></text>
-	 <use name="_zone"/>
-         <text><![CDATA[)?((?:\2)]]></text>
-         <use name="_year"/> 
-         <text><![CDATA[)?(?!/|\w|\.\d)]]></text>
-</define>
-
-
-<define name="_isodate" extract="year, ignored_sep, litmonth, month, day">
-        <text><![CDATA[(?<![\w\d])]]></text>
-        <use name="_year"/>
-	<text><![CDATA[([\./\- ])]]></text>
-        <use name="_allmonth"/>
-	<text><![CDATA[(?!\d)(?:[\./\- ] {0,2})?]]></text>
-        <use name="_day"/>
-        <text><![CDATA[(?!/)(?:(?=T)|(?!\w)(?!\.\d))]]></text>
-</define>
-
-<!-- eurodate format.  period/dot delim separated out to eurodate2 -->
-<define name="_eurodate1" extract="day, ignored_sep, litmonth, month, year">
-        <text><![CDATA[(?<![\w\.])]]></text>
-        <use name="_usday"/> 
-	<text><![CDATA[([\- /]) {0,2}]]></text>
-        <use name="_allmonth"/>
-        <text><![CDATA[\2 {0,2}]]></text>
-        <use name="_year"/>
-        <text><![CDATA[(?![\w\.])]]></text>
-</define>
-
-<!-- just period/dot delimiter.  do not allow any spaces after dots (e.g. "version 5.4. 10" -->
-<define name="_eurodate2" extract="day, litmonth, month, year">
-        <text><![CDATA[(?<![\w\.])]]></text>
-        <use name="_usday"/> 
-	<text><![CDATA[\.]]></text>
-        <use name="_allmonth"/>
-        <text><![CDATA[\.]]></text>
-        <use name="_year"/>
-        <text><![CDATA[(?![\w\.])]]></text>
-</define>
-
-
-<define name="_bareurlitdate" extract="day, litmonth, year">
-	<text><![CDATA[(\d\d?)\|\|(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\|\|(20\d\d)]]></text>
-</define>
-
-<define name="_orddate" extract="year, ord">
-	<text><![CDATA[\s([01]\d)([0123]\d\d)\s]]></text>
-</define>
-
-<!-- due to high number of false positive matches, this format is
-     limited to special cases.  either at the start of a line or in
-     filename matches only, by prefixing with a "source::" -->
-
-<!-- don't allow multiple spaces after mashed date.  indicates number in column -->
-<define name="_masheddate" extract="year, month, day">
-	<text><![CDATA[(?:^|source::).*?(?<!\d|\d\.|-)(?:20)?([9012]\d)(0\d|1[012])([012]\d|3[01])(?!\d|-| {2,})]]></text>
-</define>
-<define name="_masheddate2" extract="month, day, year">
-	<text><![CDATA[(?:^|source::).*?(?<!\d|\d\.)(0\d|1[012])([012]\d|3[01])(?:20)?([9012]\d)(?!\d| {2,})]]></text>
-</define>
-
-<define name="_utcepoch" extract="utcepoch, subsecond">
-        <!-- update regex before '2023' -->
-	<text><![CDATA[((?<=^|[\s#,"=\(\[\|\{])(?:1[0123456]|9)\d{8}|^@[\da-fA-F]{16,24})(?:\.?(\d{1,6}))?(?![\d\(])]]></text>
-</define>
-
-<timePatterns>
-      <use name="_time"/>
-      <use name="_hmtime"/>
-      <use name="_hmtime"/>
-      <use name="_dottime"/>
-      <use name="_combdatetime"/>
-      <use name="_utcepoch"/>
-      <use name="_combdatetime2"/>
-</timePatterns>
-<datePatterns>
-      <use name="_usdate1"/> 
-      <use name="_usdate2"/> 
-      <use name="_isodate"/>
-      <use name="_eurodate1"/> 
-      <use name="_eurodate2"/> 
-      <use name="_bareurlitdate"/> 
-      <use name="_orddate"/>
-      <use name="_combdatetime"/>
-      <use name="_masheddate"/>
-      <use name="_masheddate2"/>
-      <use name="_combdatetime2"/>
-</datePatterns>
-
-</datetime>
diff --git a/default/app.conf b/default/app.conf
index 771fc72..8ff339b 100644
--- a/default/app.conf
+++ b/default/app.conf
@@ -7,3 +7,6 @@ check_for_updates = false
 [ui]
 is_visible = false
 is_manageable = false
+
+[launcher]
+version = 2.0.0
diff --git a/default/inputs.conf b/default/inputs.conf
index c359b26..f7e6f67 100644
--- a/default/inputs.conf
+++ b/default/inputs.conf
@@ -61,23 +61,7 @@ sourcetype = ds_remove:output
 source = ds_remove_output
 script = . "$SplunkHome\etc\apps\SplunkForwarderRepairKit\bin\dsRemove.ps1"
 deploymentServerUri =
-deploymentClientApp = 
-
-### Scripts used to correct issues with datetime.xml
-### https://docs.splunk.com/Documentation/Splunk/latest/ReleaseNotes/FixDatetimexml2020
-[script://./bin/dateTimeCorrect.sh]
-disabled = 1
-index = _internal
-sourcetype = datetime_correct:output
-interval = -1
-source = datetime_correct_output
-
-[powershell://dateTimeCorrect]
-disabled = 1
-index = _internal
-sourcetype = datetime_correct:output
-source = datetime_correct_output
-script = . "$SplunkHome\etc\apps\SplunkForwarderRepairKit\bin\dateTimeCorrect.ps1"
+deploymentClientApp =
 
 ### Admin password change scripts
 [script://./bin/pwchange.sh]
diff --git a/default/limits.conf b/default/limits.conf
deleted file mode 100644
index b4470b8..0000000
--- a/default/limits.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[system_checks]
-installed_files_integrity = log_only
\ No newline at end of file
