diff --git a/src/block/Block.php b/src/block/Block.php
index f204a788c..4e55af2e3 100644
--- a/src/block/Block.php
+++ b/src/block/Block.php
@@ -236,13 +236,3 @@ abstract class Block extends Position{
 	
 	abstract function onUpdate($type);
 }
-
-/***REM_START***/
-require_once("block/GenericBlock.php");
-require_once("block/SolidBlock.php");
-require_once("block/TransparentBlock.php");
-require_once("block/FallableBlock.php");
-require_once("block/LiquidBlock.php");
-require_once("block/StairBlock.php");
-require_once("block/DoorBlock.php");
-/***REM_END***/
diff --git a/src/block/Furnace.php b/src/block/Furnace.php
index 9d895814b..fd451de62 100644
--- a/src/block/Furnace.php
+++ b/src/block/Furnace.php
@@ -19,10 +19,6 @@
  *
 */
 
-/***REM_START***/
-require_once("BurningFurnace.php");
-/***REM_END***/
-
 
 class FurnaceBlock extends BurningFurnaceBlock{
 	public function __construct($meta = 0){
diff --git a/src/block/StillWater.php b/src/block/StillWater.php
index 57b531751..33dc38cfd 100644
--- a/src/block/StillWater.php
+++ b/src/block/StillWater.php
@@ -19,11 +19,6 @@
  *
 */
 
-
-/***REM_START***/
-require_once("Water.php");
-/***REM_END***/
-
 class StillWaterBlock extends WaterBlock{
 	public function __construct($meta = 0){
 		LiquidBlock::__construct(STILL_WATER, $meta, "Still Water");
diff --git a/src/block/WallSign.php b/src/block/WallSign.php
index 1f0157c73..2931da86f 100644
--- a/src/block/WallSign.php
+++ b/src/block/WallSign.php
@@ -19,10 +19,6 @@
  *
 */
 
-/***REM_START***/
-require_once("SignPost.php");
-/***REM_END***/
-
 class WallSignBlock extends SignPostBlock{
 	public function __construct($meta = 0){
 		TransparentBlock::__construct(WALL_SIGN, $meta, "Wall Sign");
diff --git a/src/entity/DroppedItem.php b/src/entity/DroppedItem.php
index ddbc5a6f2..19e1cca69 100644
--- a/src/entity/DroppedItem.php
+++ b/src/entity/DroppedItem.php
@@ -19,6 +19,9 @@
  *
 */
 
+namespace PocketMine\Entity;
+use PocketMine;
+
 class DroppedItem extends Entity{
 
 }
\ No newline at end of file
diff --git a/src/tests/ServerSuiteTest.php b/src/tests/ServerSuiteTest.php
index 97a94316a..41b6dfc55 100644
--- a/src/tests/ServerSuiteTest.php
+++ b/src/tests/ServerSuiteTest.php
@@ -1,6 +1,6 @@
 <?php
 exit(0);//TODO
-/***REM_START***/
+
 		$testErrors = 0;
 		function testCase($name, $output, $expected){
 			global $testErrors;
@@ -57,5 +57,4 @@ exit(0);//TODO
 				//Everything done!
 				$server->close();
 			}
-		}
-/***REM_END***/
\ No newline at end of file
+		}
\ No newline at end of file