diff --git a/LEGO1/lego/legoomni/src/actors/bike.cpp b/LEGO1/lego/legoomni/src/actors/bike.cpp
index 733d6ec1..4ee38159 100644
--- a/LEGO1/lego/legoomni/src/actors/bike.cpp
+++ b/LEGO1/lego/legoomni/src/actors/bike.cpp
@@ -1,5 +1,6 @@
 #include "bike.h"
 
+#include "isle_actions.h"
 #include "legocontrolmanager.h"
 #include "legogamestate.h"
 #include "legoomni.h"
@@ -35,11 +36,11 @@ void Bike::VTable0xe4()
 {
 	IslePathActor::VTable0xe4();
 	GameState()->SetCurrentArea(LegoGameState::Area::e_bike);
-	RemoveFromCurrentWorld(*g_isleScript, 11);
-	RemoveFromCurrentWorld(*g_isleScript, 12);
-	RemoveFromCurrentWorld(*g_isleScript, 15);
-	RemoveFromCurrentWorld(*g_isleScript, 14);
-	RemoveFromCurrentWorld(*g_isleScript, 13);
+	RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeDashboard_Bitmap);
+	RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeArms_Ctl);
+	RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeHorn_Ctl);
+	RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeHorn_Sound);
+	RemoveFromCurrentWorld(*g_isleScript, IsleScript::c_BikeInfo_Ctl);
 	ControlManager()->Unregister(this);
 }
 
diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp
index d1df71db..6b473ba4 100644
--- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp
@@ -79,13 +79,13 @@ void Helicopter::VTable0xe4()
 	}
 
 	m_state->SetUnknown8(0);
-	RemoveFromCurrentWorld(m_script, 0x16);
-	RemoveFromCurrentWorld(m_script, 0x17);
-	RemoveFromCurrentWorld(m_script, 0x18);
-	RemoveFromCurrentWorld(m_script, 0x19);
-	RemoveFromCurrentWorld(m_script, 0x1a);
-	RemoveFromCurrentWorld(m_script, 0x1b);
-	RemoveFromCurrentWorld(m_script, 0x1c);
+	RemoveFromCurrentWorld(m_script, IsleScript::c_HelicopterDashboard_Bitmap);
+	RemoveFromCurrentWorld(m_script, IsleScript::c_HelicopterArms_Ctl);
+	RemoveFromCurrentWorld(m_script, IsleScript::c_Helicopter_TakeOff_Ctl);
+	RemoveFromCurrentWorld(m_script, IsleScript::c_Helicopter_Land_Ctl);
+	RemoveFromCurrentWorld(m_script, Act3Script::c_Helicopter_Pizza_Ctl);
+	RemoveFromCurrentWorld(m_script, Act3Script::c_Helicopter_Donut_Ctl);
+	RemoveFromCurrentWorld(m_script, Act3Script::c_Helicopter_Info_Ctl);
 	RemoveFromCurrentWorld(m_script, 0x1d);
 	RemoveFromCurrentWorld(m_script, 0x1e);
 	RemoveFromCurrentWorld(m_script, 0x1f);
diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp
index 114e3ee9..b87e5d60 100644
--- a/LEGO1/lego/legoomni/src/common/legoutils.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp
@@ -242,6 +242,7 @@ void ConvertHSVToRGB(float p_h, float p_s, float p_v, float* p_rOut, float* p_bO
 MxBool RemoveFromCurrentWorld(MxAtomId& p_atomId, MxS32 p_id)
 {
 	LegoWorld* world = CurrentWorld();
+
 	if (world) {
 		MxCore* object = world->Find(p_atomId, p_id);