diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf
index 983fedec1..60798d984 100644
--- a/SQF/dayz_code/compile/player_switchModel.sqf
+++ b/SQF/dayz_code/compile/player_switchModel.sqf
@@ -4,24 +4,13 @@ _class 			= _this;
 _position 		= getPosATL player;
 _dir 			= getDir player;
 _currentAnim 	= animationState player;
-//_currentCamera	= cameraView;
 
 _tagSetting = player getVariable["DZE_display_name",false];
 
 //Get PlayerID
-_playerUID = "";
-if (count playableUnits == 0 and isServer) then {
-	//In Single Player
-	isSinglePlayer = true;
-	player sidechat "Single player Mode detected!";
-	//_id = [42,"SinglePlayer"] spawn server_onPlayerConnect;
-	_playerUID = "42";
-} else {
-	_playerUID = getPlayerUID player;
-};
+_playerUID = getPlayerUID player;
 
 //BackUp Weapons and Mags
-
 _weapons 	= weapons player;
 _magazines	= call player_countmagazines; //magazines player;
 
@@ -46,15 +35,6 @@ if (count _muzzles > 1) then {
 	_currentWpn = currentMuzzle player;
 };
 
-//Debug Message
-/*
-diag_log "Attempting to switch model";
-diag_log str(_weapons);
-diag_log str(_magazines);
-diag_log (str(_backpackWpn));
-diag_log (str(_backpackMag));
-*/
-
 //Secure Player for Transformation
 player setPosATL dayz_spawnPos;
 
@@ -123,14 +103,6 @@ if(_secweapon != (secondaryWeapon _newUnit) && _secweapon != "") then {
 	_newUnit addWeapon _secweapon;		
 };
 
-//Debug Message
-/*
-diag_log "Swichtable Unit Created. Equipment:";
-diag_log str(weapons _newUnit);
-diag_log str(magazines _newUnit);
-diag_log str(getWeaponCargo unitBackpack _newUnit);
-diag_log str(getMagazineCargo unitBackpack _newUnit);
-*/
 //Make New Unit Playable
 addSwitchableUnit _newUnit;
 setPlayable _newUnit;
@@ -144,7 +116,6 @@ deleteVehicle _oldUnit;
 
 //Move player inside
 
-//	player switchCamera = _currentCamera;
 if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;};
 [objNull, player, rSwitchMove,_currentAnim] call RE;
 //dayz_originalPlayer attachTo [_newUnit];
diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf
index 68de0562a..0f7788420 100644
--- a/SQF/dayz_server/init/server_functions.sqf
+++ b/SQF/dayz_server/init/server_functions.sqf
@@ -14,7 +14,7 @@ BIS_MPF_remoteExecutionServer = {
 	};
 };*/
 
-BIS_Effects_Burn =			{};
+BIS_Effects_Burn =				{};
 server_playerLogin =			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerLogin.sqf";
 server_playerSetup =			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSetup.sqf";
 server_onPlayerDisconnect = 	compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_onPlayerDisconnect.sqf";
diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf
index 7bae1141e..74eeb657f 100644
--- a/SQF/dayz_server/system/server_monitor.sqf
+++ b/SQF/dayz_server/system/server_monitor.sqf
@@ -3,10 +3,6 @@ private ["_nul","_result","_pos","_wsDone","_dir","_block","_isOK","_countr","_o
 dayz_versionNo = 		getText(configFile >> "CfgMods" >> "DayZ" >> "version");
 dayz_hiveVersionNo = 	getNumber(configFile >> "CfgMods" >> "DayZ" >> "hiveVersion");
 
-if ((count playableUnits == 0) and !isDedicated) then {
-	isSinglePlayer = true;
-};
-
 waitUntil{initialized}; //means all the functions are now defined
 
 diag_log "HIVE: Starting";