diff --git a/frontend/api.local.php b/frontend/api.local.php
index 28e70b5..bf8ab43 100644
--- a/frontend/api.local.php
+++ b/frontend/api.local.php
@@ -106,5 +106,3 @@ echo(json_encode(array(
 	'status'	=> $return_success,
 	'data'		=> $return_object
 )));
-
-?>
diff --git a/frontend/cron.15.php b/frontend/cron.15.php
index eea9d57..5b82a1c 100644
--- a/frontend/cron.15.php
+++ b/frontend/cron.15.php
@@ -35,4 +35,3 @@ if($result = mysql_query_cached("SELECT * FROM containers"))
 		}
 	}
 }
-?>
diff --git a/frontend/index.php b/frontend/index.php
index 08660b9..a6b0615 100644
--- a/frontend/index.php
+++ b/frontend/index.php
@@ -12,5 +12,3 @@
  */
 
 require("rewrite.php");
-
-?>
diff --git a/frontend/module.admin.php b/frontend/module.admin.php
index 69c5026..d9d24ed 100644
--- a/frontend/module.admin.php
+++ b/frontend/module.admin.php
@@ -46,4 +46,3 @@ catch (InsufficientAccessLevelException $e)
 	$err = new CPHPErrorHandler(CPHP_ERRORHANDLER_TYPE_ERROR, "You are not authorized to view this page", "Your access level is not sufficient.");
 	$sMainContents .= $err->Render();
 }
-?>
diff --git a/frontend/module.home.php b/frontend/module.home.php
deleted file mode 100644
index d94ebdf..0000000
--- a/frontend/module.home.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * CVM is more free software. It is licensed under the WTFPL, which
- * allows you to do pretty much anything with it, without having to
- * ask permission. Commercial use is allowed, and no attribution is
- * required. We do politely request that you share your modifications
- * to benefit other developers, but you are under no enforced
- * obligation to do so :)
- * 
- * Please read the accompanying LICENSE document for the full WTFPL
- * licensing text.
- */
-
-if(!isset($_CVM)) { die("Unauthorized."); }
-
-$sMainContents = "Overview goes here...";
-?>
diff --git a/frontend/module.list.php b/frontend/module.list.php
index 0dc9c94..b3c116d 100644
--- a/frontend/module.list.php
+++ b/frontend/module.list.php
@@ -45,4 +45,3 @@ else
 {
 	throw new UnauthorizedException("You must be logged in to view this page.");
 }
-?>
diff --git a/frontend/module.vps.overview.php b/frontend/module.vps.overview.php
index 374672d..8269cbd 100644
--- a/frontend/module.vps.overview.php
+++ b/frontend/module.vps.overview.php
@@ -85,4 +85,3 @@ catch (SshExitException $e)
 
 
 $sPageContents = Templater::InlineRender("vps.overview", $locale->strings, $sVariables);
-?>
diff --git a/frontend/module.vps.password.php b/frontend/module.vps.password.php
index 8ba1bf9..20fffed 100644
--- a/frontend/module.vps.password.php
+++ b/frontend/module.vps.password.php
@@ -66,4 +66,3 @@ if($display_form === true)
 		'id'	=> $sContainer->sId
 	));
 }
-?>
diff --git a/frontend/module.vps.php b/frontend/module.vps.php
index 4c6e011..0d05f0c 100644
--- a/frontend/module.vps.php
+++ b/frontend/module.vps.php
@@ -70,4 +70,3 @@ catch(NotFoundException $e)
 {
 	$sMainContents = Templater::InlineRender("error.vps.notfound");
 }
-?>
diff --git a/frontend/module.vps.reinstall.php b/frontend/module.vps.reinstall.php
index 740aa45..2abff1d 100644
--- a/frontend/module.vps.reinstall.php
+++ b/frontend/module.vps.reinstall.php
@@ -99,4 +99,3 @@ if($display_form === true)
 		'templates'	=> $sTemplateList
 	));
 }
-?>
diff --git a/frontend/rewrite.php b/frontend/rewrite.php
index cff2210..c18d04f 100644
--- a/frontend/rewrite.php
+++ b/frontend/rewrite.php
@@ -16,8 +16,6 @@ require("includes/include.base.php");
 
 $sTemplateParameters = array();
 
-//$_SESSION['userid'] = 1;
-
 if(!empty($_SESSION['userid']))
 {
 	$sUser = new User($_SESSION['userid']);
@@ -76,5 +74,3 @@ $sTemplateParameters = array_merge($sTemplateParameters, array(
 ));
 
 echo(Templater::InlineRender("main", $locale->strings, $sTemplateParameters));
-
-?>
diff --git a/frontend/submodule.restart.php b/frontend/submodule.restart.php
index a97f565..041068f 100644
--- a/frontend/submodule.restart.php
+++ b/frontend/submodule.restart.php
@@ -40,5 +40,3 @@ catch(ContainerStartException $e)
 	$err = new CPHPErrorHandler(CPHP_ERRORHANDLER_TYPE_ERROR, "Container failed to start", "Your container could not be started. If this error persists, please file a support ticket.");
 	$sError .= $err->Render();
 }
-
-?>
diff --git a/frontend/submodule.start.php b/frontend/submodule.start.php
index 104b9cf..d16802b 100644
--- a/frontend/submodule.start.php
+++ b/frontend/submodule.start.php
@@ -39,5 +39,3 @@ else
 	$err = new CPHPErrorHandler(CPHP_ERRORHANDLER_TYPE_ERROR, "Container can't be started", "Your container cannot be started because it is already running.");
 	$sError .= $err->Render();
 }
-
-?>
diff --git a/frontend/submodule.stop.php b/frontend/submodule.stop.php
index c651401..2b78a15 100644
--- a/frontend/submodule.stop.php
+++ b/frontend/submodule.stop.php
@@ -34,5 +34,3 @@ else
 	$err = new CPHPErrorHandler(CPHP_ERRORHANDLER_TYPE_ERROR, "Container can't be stopped", "Your container cannot be stopped because it is not running.");
 	$sError .= $err->Render();
 }
-
-?>