diff --git a/.gitlab/issue_templates/.gitkeep b/.gitlab/issue_templates/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.gitlab/issue_templates/Bug Report.md b/.gitlab/issue_templates/Bug Report.md
new file mode 100644
index 000000000..4bfda573a
--- /dev/null
+++ b/.gitlab/issue_templates/Bug Report.md	
@@ -0,0 +1,8 @@
+### Description of issue
+Describe in detail what exactly happened. No "it no workie" will be accepted. Clear and concise definitions of what *exactly* the problem is.
+
+### What should have happened
+Write out what the expected behavior/etc is.
+
+### Reproduction steps (if applicable)
+Inform us how to reproduce this issue so we can effectively debug it.
diff --git a/.gitlab/issue_templates/Proposal.md b/.gitlab/issue_templates/Proposal.md
new file mode 100644
index 000000000..48b42c06a
--- /dev/null
+++ b/.gitlab/issue_templates/Proposal.md
@@ -0,0 +1,8 @@
+### What is being proposed
+Write a clear and verbose description here of what exactly is being proposed.
+
+### Pros 
+* List out bullet points here of pros 
+
+### Cons
+* List out bullet points here of potential cons
diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java
index 8857bf917..287e4c580 100644
--- a/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java
+++ b/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java
@@ -68,7 +68,6 @@ public final class BuildOptionPlugin extends OptionHandler {
 			SystemLogger.logErr("Construction (building):  " + hotspot +  " : " + object + " chunkX = " + object.getLocation().getChunkX() + ", chunkY = " + object.getLocation().getChunkY());
 			return true;
 		}
-		System.out.println(object + " chunkX = " + object.getCenterLocation().getChunkX() + ", chunkY = " + object.getCenterLocation().getChunkY());
 
 		player.setAttribute("con:hotspot", hotspot);
 		BuildingUtils.openBuildInterface(player, hotspot.getHotspot());
diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/Room.java b/Server/src/main/java/core/game/node/entity/skill/construction/Room.java
index 95babac91..ac800fda8 100644
--- a/Server/src/main/java/core/game/node/entity/skill/construction/Room.java
+++ b/Server/src/main/java/core/game/node/entity/skill/construction/Room.java
@@ -6,6 +6,7 @@ import core.game.node.object.Scenery;
 import core.game.node.object.SceneryBuilder;
 import core.game.world.map.*;
 import rs09.game.node.entity.skill.construction.Hotspot;
+import rs09.game.system.SystemLogger;
 
 /**
  * Represents a room.
@@ -151,12 +152,12 @@ public final class Room {
 				spot.setCurrentY(pos[1]);
 			}
 		}
-		if (!house.isBuildingMode()) {
-			removeHotspots(housePlane, house, chunk);
-		}
 		if (rotation != Direction.NORTH && chunk.getRotation() == 0) {
 			chunk.rotate(rotation);
 		}
+		if (!house.isBuildingMode()) {
+			removeHotspots(housePlane, house, chunk);
+		}
 	}
 	
 	/**
@@ -176,13 +177,6 @@ public final class Room {
 								chunk.remove(object);
 							}
 						} else {
-//							BuildHotspot hs = BuildHotspot.forId(object.protocol(), house.getStyle());
-//							for (Hotspot h : hotspots) {
-//								if (h != null && h.getHotspot() == hs && h.getHotspot().getObjectIds() == null) {
-//									chunk.remove(object);
-//									break;
-//								}
-//							}
 							chunk.remove(object);
 						}
 					}