diff --git a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
index de69f4c..f668f6d 100644
--- a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
+++ b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
@@ -78,7 +78,8 @@ COM_PATCHTESTER_FILTER_APPLIED_PATCHES="Filter Applied Patches"
 COM_PATCHTESTER_FILTER_BRANCH="Filter Target Branch"
 COM_PATCHTESTER_FILTER_RTC_PATCHES="Filter RTC Patches"
 COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION="Search the list by title or prefix with 'id:' to search by Pull ID."
-COM_PATCHTESTER_GOTO="Go to"
+COM_PATCHTESTER_GOTO_PATCHTESTER="Go to <a href=""index.php?option=com_patchtester"" alt="Go to Patch Tester">Patch Tester</a>"
+COM_PATCHTESTER_GOTO_PATCHTESTER_OPTIONS="Go to <a href=""index.php?option=com_config&view=component&component=com_patchtester#authentication"" alt="Go to Options">Options</a>"
 COM_PATCHTESTER_GITHUB="GitHub"
 COM_PATCHTESTER_HEADING_FETCH_DATA="Fetching GitHub Data"
 COM_PATCHTESTER_INSTALL_TEXT="Patch Tester Install script"
@@ -90,7 +91,6 @@ COM_PATCHTESTER_NO_FILES_TO_PATCH="There are no files to patch from this pull re
 COM_PATCHTESTER_NO_ITEMS="No data has been retrieved from GitHub, please click the 'Fetch Data' button in the toolbar to retrieve the open pull requests."
 COM_PATCHTESTER_NOT_APPLIED="Not Applied"
 COM_PATCHTESTER_NOT_RTC="Not RTC"
-COM_PATCHTESTER_OPTIONS="Options"
 COM_PATCHTESTER_POSTFLIGHT_DISCOVER_INSTALL_TEXT="Patch Tester postflight discover install script"
 COM_PATCHTESTER_POSTFLIGHT_INSTALL_TEXT="Patch Tester postflight install script"
 COM_PATCHTESTER_POSTFLIGHT_UNINSTALL_TEXT="Patch Tester postflight uninstall script"
diff --git a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.sys.ini b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.sys.ini
index a470230..a33e6b1 100644
--- a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.sys.ini
+++ b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.sys.ini
@@ -10,14 +10,4 @@ COM_PATCHTESTER_XML_DESCRIPTION="Component for pull request management testing"
 COM_PATCHTESTER_GOTO="Go to"
 COM_PATCHTESTER_LINK="Component"
 COM_PATCHTESTER_OPTIONS="Options"
-COM_PATCHTESTER_INSTALL_TEXT="Patch Tester Install script"
-COM_PATCHTESTER_POSTFLIGHT_DISCOVER_INSTALL_TEXT="Patch Tester postflight discover install script"
-COM_PATCHTESTER_POSTFLIGHT_INSTALL_TEXT="Patch Tester postflight install script"
-COM_PATCHTESTER_POSTFLIGHT_UNINSTALL_TEXT="Patch Tester postflight uninstall script"
-COM_PATCHTESTER_POSTFLIGHT_UPDATE_TEXT="Patch Tester postflight update script"
-COM_PATCHTESTER_PREFLIGHT_DISCOVER_INSTALL_TEXT="Patch Tester preflight discover install script"
-COM_PATCHTESTER_PREFLIGHT_INSTALL_TEXT="Patch Tester preflight install script"
-COM_PATCHTESTER_PREFLIGHT_UNINSTALL_TEXT="Patch Tester preflight uninstall script"
-COM_PATCHTESTER_PREFLIGHT_UPDATE_TEXT="Patch Tester preflight update script"
-COM_PATCHTESTER_UNINSTALL_TEXT="Patch Tester Uninstall script"
 COM_PATCHTESTER_UPDATE_TEXT="Patch Tester Update script. Patch Tester now updated to version %s."
\ No newline at end of file
diff --git a/administrator/components/com_patchtester/script.php b/administrator/components/com_patchtester/script.php
index c9fb851..6f1e3ef 100644
--- a/administrator/components/com_patchtester/script.php
+++ b/administrator/components/com_patchtester/script.php
@@ -51,15 +51,18 @@ class Com_PatchtesterInstallerScript extends InstallerScript
 	 */
 	public function postflight($type, $parent)
 	{
+		$this->removeFiles();
 		if ($type == 'install')
 		{
 			$language = JFactory::getLanguage();
 			$language->load('com_patchtester', JPATH_ADMINISTRATOR, null, true);
 			$language->load('com_patchtester', JPATH_SITE, null, true);
-			echo '<h1><img src="../media/com_patchtester/images/icon-48-patchtester.png"> ' . Text::_('COM_PATCHTESTER') . '</h1>';
-			echo '<p>' . Text::_('COM_PATCHTESTER_XML_DESCRIPTION') . '</p>';
-			echo '<p>' . Text::_('COM_PATCHTESTER_GOTO') . ' <a href="index.php?option=com_patchtester">' . Text::_('COM_PATCHTESTER') . '</a></p>';
-			echo '<p>' . Text::_('COM_PATCHTESTER_GOTO') . ' <a href="index.php?option=com_config&view=component&component=com_patchtester#authentication	&path=&return=aHR0cDovL2xvY2FsaG9zdC9wYXRjaDRhMTIvYWRtaW5pc3RyYXRvci9pbmRleC5waHA%2Fb3B0aW9uPWNvbV9wYXRjaHRlc3Rlcg%3D%3D">' . Text::_('COM_PATCHTESTER_OPTIONS') . '</a></p>';
+			?>
+			<h1><img src="../media/com_patchtester/images/icon-48-patchtester.png"><?php echo Text::_('COM_PATCHTESTER'); ?></h1>
+			<p><?php echo Text::_('COM_PATCHTESTER_XML_DESCRIPTION'); ?></p>
+			<p><?php echo Text::_('COM_PATCHTESTER_GOTO_PATCHTESTER'); ?></a></p>
+			<p><?php echo Text::_('COM_PATCHTESTER_GOTO_PATCHTESTER_OPTIONS'); ?></a></p>
+            <?php
 		}
 
 		if ($type == 'uninstall')
@@ -67,8 +70,10 @@ class Com_PatchtesterInstallerScript extends InstallerScript
 			$language = JFactory::getLanguage();
 			$language->load('com_patchtester', JPATH_ADMINISTRATOR, null, true);
 			$language->load('com_patchtester', JPATH_SITE, null, true);
-			echo '<h1>' . Text::_('COM_PATCHTESTER') . '</h1>';
-			echo '<p>' . Text::_('COM_PATCHTESTER_UNINSTALL_THANK_YOU') . '</p>';
+			?>
+			<h1><?php echo Text::_('COM_PATCHTESTER'); ?></h1>
+			<p><?php echo Text::_('COM_PATCHTESTER_UNINSTALL_THANK_YOU'); ?></p>
+            <?php
 		}
 	}
 }