diff --git a/controllers/d.admin.php b/controllers/d.admin.php
index b04ec96..e117622 100755
--- a/controllers/d.admin.php
+++ b/controllers/d.admin.php
@@ -283,5 +283,3 @@ function formatBytes($bytes, $locale = 'en', $precision = 2) {
 
 	return $formatted . ' ' . $units[$power];
 }
-
-?>
\ No newline at end of file
diff --git a/controllers/d.blog.php b/controllers/d.blog.php
index 5c78098..145e72e 100755
--- a/controllers/d.blog.php
+++ b/controllers/d.blog.php
@@ -189,5 +189,3 @@ switch ($controller->splitted_url[1]) {
 		}
 		break;
 }
-
-?>
\ No newline at end of file
diff --git a/controllers/d.contact.php b/controllers/d.contact.php
index fdaaae8..ff0f0f0 100755
--- a/controllers/d.contact.php
+++ b/controllers/d.contact.php
@@ -72,6 +72,3 @@ $head['js'] = "d.captcha.js";
 $head['title'] = "Contact";
 
 include ($config['views_folder']."d.contact.html");
-
-
-?>
\ No newline at end of file
diff --git a/controllers/d.map.php b/controllers/d.map.php
index 4a25c67..2b5bd51 100755
--- a/controllers/d.map.php
+++ b/controllers/d.map.php
@@ -18,5 +18,3 @@ else {
 	require_once($config['includes_folder']."poi_types.struct.php");
 	include ($config['views_folder']."d.map.html");
 }
-
-?>
\ No newline at end of file
diff --git a/controllers/d.poi.php b/controllers/d.poi.php
index a85cb5d..245cd17 100755
--- a/controllers/d.poi.php
+++ b/controllers/d.poi.php
@@ -274,5 +274,3 @@ switch ($controller->splitted_url[1]) {
 		}
 		break;
 }
-
-?>
diff --git a/controllers/d.users.php b/controllers/d.users.php
index bb67720..481e152 100755
--- a/controllers/d.users.php
+++ b/controllers/d.users.php
@@ -223,5 +223,3 @@ if(isset($controller->splitted_url[1])) {
 else {
 	$notfound = 1;
 }
-
-?>
\ No newline at end of file
diff --git a/controllers/d.wiki.php b/controllers/d.wiki.php
index 2537e82..4de7409 100755
--- a/controllers/d.wiki.php
+++ b/controllers/d.wiki.php
@@ -77,5 +77,3 @@ else if(isset($controller->splitted_url[1]) && $wikiPage->checkPermalink($contro
 else {
 	$notfound = 1;
 }
-
-?>
\ No newline at end of file
diff --git a/includes/config.example.php b/includes/config.example.php
index 6c65602..9d801c2 100755
--- a/includes/config.example.php
+++ b/includes/config.example.php
@@ -48,5 +48,3 @@ $config['SQL_db'] = "postgres";
 
 $config['admin_mail'] = "leo@lstronic.com";
 $config['bot_mail'] = "robot@kabano.com";
-
-?>
\ No newline at end of file
diff --git a/includes/images.php b/includes/images.php
index ff8e653..16005b2 100755
--- a/includes/images.php
+++ b/includes/images.php
@@ -38,5 +38,3 @@ function generate_image_thumbnail($source_image_path, $thumbnail_image_path, $wi
 	imagedestroy($thumbnail_gd_image);
 	return true;
 }
-
-?>
\ No newline at end of file
diff --git a/includes/poi_types.struct.php b/includes/poi_types.struct.php
index 4dcc279..5da6b52 100644
--- a/includes/poi_types.struct.php
+++ b/includes/poi_types.struct.php
@@ -89,5 +89,3 @@ $poi_types = array(
     )
 
 );
-
-?>
diff --git a/includes/routes.php b/includes/routes.php
index 65a325b..643baf3 100755
--- a/includes/routes.php
+++ b/includes/routes.php
@@ -70,5 +70,3 @@ if($notfound) {
     $head['title'] = $wikiPage->name;
     include ($config['views_folder']."d.wiki.view.html");
 }
-
-?>
diff --git a/includes/session.php b/includes/session.php
index 32572b3..76af0a3 100755
--- a/includes/session.php
+++ b/includes/session.php
@@ -33,6 +33,3 @@ if (PHP_VERSION_ID < 80000) {
 }
 $user->datetime_format = new IntlDateFormatter($config['locale'], IntlDateFormatter::LONG, IntlDateFormatter::SHORT, $config['timezone']);
 $user->datetimeshort_format = new IntlDateFormatter($config['locale'], IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, $config['timezone']);
-
-
-?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 5ed4125..a566447 100755
--- a/index.php
+++ b/index.php
@@ -2,5 +2,3 @@
 
 require_once('includes/config.php');
 require_once('includes/routes.php');
-
-?>
\ No newline at end of file
diff --git a/models/d.blog.php b/models/d.blog.php
index 3012025..64b989b 100755
--- a/models/d.blog.php
+++ b/models/d.blog.php
@@ -370,5 +370,3 @@ class BlogArticles
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/models/d.comments.php b/models/d.comments.php
index 4130b42..95d2b2a 100644
--- a/models/d.comments.php
+++ b/models/d.comments.php
@@ -204,5 +204,3 @@ class Comments
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/models/d.locales.php b/models/d.locales.php
index 66840bd..fc5b2a4 100755
--- a/models/d.locales.php
+++ b/models/d.locales.php
@@ -94,5 +94,3 @@ class Locales
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/models/d.poi.php b/models/d.poi.php
index 4986020..3f43b4c 100755
--- a/models/d.poi.php
+++ b/models/d.poi.php
@@ -453,5 +453,3 @@ class Pois
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/models/d.users.php b/models/d.users.php
index d75f61a..2d86593 100755
--- a/models/d.users.php
+++ b/models/d.users.php
@@ -451,5 +451,3 @@ class Users
 		}
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/models/d.wiki.php b/models/d.wiki.php
index 5970e23..ce97d72 100755
--- a/models/d.wiki.php
+++ b/models/d.wiki.php
@@ -301,5 +301,3 @@ class WikiPages
 		}
 	}
 }
-
-?>
\ No newline at end of file