cleanup all the "#if 1" macro blocks

engine/server/library/serverGame/src/shared/controller/ServerController.cpp

@@ -562,12 +562,12 @@ void ServerController::handleNetUpdateTransformWithParent(const MessageQueueData
 	if(!cellObject)
 	{
 		WARNING_STRICT_FATAL(true, ("WARNING: db or authoritative player says to depersist %s into a cell %s but we cannot because cell does not exist.", getOwner()->getNetworkId().getValueString().c_str(), cellNetworkId.getValueString().c_str()));
+
 		//@todo big demo hack.  If depersisting into a cell, set the transform to start lcoation
-#if 1
 		Transform start = Transform::identity;
 		start.setPosition_p(ConfigServerGame::getStartingPosition());
 		setGoal( start, nullptr );
-#endif
+
 		return;
 	}
 	setGoal( message.getTransform(), serverCellObject );

engine/server/library/serverGame/src/shared/object/BuildingObject.cpp

@@ -611,8 +611,7 @@ bool BuildingObject::isAllowed(CreatureObject const &who) const
 		// allow vendor-creatures to be placed in the building
 		if (who.hasCondition(static_cast<int>(ServerTangibleObjectTemplate::C_vendor)))
 			return true;
-		// JU_TODO: test
-#if 1
+
 		// allow non-player-controlled creatures in private buildings if the *creature* has no owner
 		if (!who.isPlayerControlled() 
 			&& who.getMasterId() == NetworkId::cms_invalid 
@@ -621,8 +620,7 @@ bool BuildingObject::isAllowed(CreatureObject const &who) const
 		{
 			return true;
 		}
-#endif
-		// JU_TODO: end test
+
 		return CellPermissions::isOnList(m_allowed.get(), who);
 	}
 }