diff --git a/mocha-php/src/mocha-php/include/Configuration.inc.php b/mocha-php/src/mocha-php/include/Configuration.inc.php
index 103a0af..bad6c72 100644
--- a/mocha-php/src/mocha-php/include/Configuration.inc.php
+++ b/mocha-php/src/mocha-php/include/Configuration.inc.php
@@ -16,13 +16,12 @@
 	System::$Configuration["Database.DatabaseName"] = "@@MOCHA_DB_DATABASENAME@@";
 	System::$Configuration["Database.UserName"] = "@@MOCHA_DB_USERNAME@@";
 	System::$Configuration["Database.Password"] = "@@MOCHA_DB_PASSWORD@@";
-	
+
 	System::$Configuration["LoginPageRedirectURL"] = "~/madi/authgwy/$(CurrentTenantName)/login.htmld";
 	System::$Configuration["Runtime.DisableAutomaticExtensionParsing"] = true;
-	
+
 	System::$Configuration["Paths.MasterPages"] = [ "/ui/masterPages" ];
 	System::$Configuration["Paths.Pages"] = [ "/ui/pages" ];
-	
+
 	require_once ("BeforeLaunchEvent.inc.php");
 
-?>
diff --git a/mocha-php/src/mocha-php/index.php b/mocha-php/src/mocha-php/index.php
index bd80248..3791707 100644
--- a/mocha-php/src/mocha-php/index.php
+++ b/mocha-php/src/mocha-php/index.php
@@ -39,4 +39,3 @@
 	// *.phpx.php files as PHP code-behind files. We may decide to use the *.ctlx extension
 	// (and its associated *.ctlx.php) for PHPX controls.
 	System::Launch();
-?>
diff --git a/mocha-php/src/mocha-php/lib/mocha/oms/OmsMetadataException.inc.php b/mocha-php/src/mocha-php/lib/mocha/oms/OmsMetadataException.inc.php
index eee6b4b..36a69a1 100644
--- a/mocha-php/src/mocha-php/lib/mocha/oms/OmsMetadataException.inc.php
+++ b/mocha-php/src/mocha-php/lib/mocha/oms/OmsMetadataException.inc.php
@@ -3,7 +3,7 @@
 	namespace Mocha\Oms;
 
 	use Phast\Enumeration;
-	
+
 	class OmsMetadataExceptionSeverity extends Enumeration
 	{
 		const None = 0;
@@ -28,4 +28,4 @@
 		}
 
 	}
-?>
\ No newline at end of file
+
diff --git a/mocha-php/src/mocha-php/lib/mocha/system.inc.php b/mocha-php/src/mocha-php/lib/mocha/system.inc.php
index 66562b6..c1cca6b 100644
--- a/mocha-php/src/mocha-php/lib/mocha/system.inc.php
+++ b/mocha-php/src/mocha-php/lib/mocha/system.inc.php
@@ -43,4 +43,3 @@
 	require("ui/tasks/Task.inc.php");
 	require("ui/tasks/HardcodedTask.inc.php");
 
-?>
\ No newline at end of file
diff --git a/mocha-php/src/mocha-tms/include/Configuration.inc.php b/mocha-php/src/mocha-tms/include/Configuration.inc.php
index 72b36d5..d37307c 100644
--- a/mocha-php/src/mocha-tms/include/Configuration.inc.php
+++ b/mocha-php/src/mocha-tms/include/Configuration.inc.php
@@ -18,5 +18,3 @@
 	System::$Configuration["Database.DatabaseName"] = "mocha_suv";
 	System::$Configuration["Database.UserName"] = "mocha_suv";
 	System::$Configuration["Database.Password"] = "TjMG2k8eAR5xAHE613qJsNAagTBPGfaj";
-	
-?>