diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index 2a3631e5..9d33124c 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -158,23 +158,18 @@ void Core::Entity::Player::playGilShop( uint32_t eventId, uint32_t flags,
 
 Core::Event::EventHandlerPtr Core::Entity::Player::bootstrapSceneEvent( uint32_t eventId, uint32_t flags )
 {
-  if( flags & 0x02 )
-    setStateFlag( PlayerStateFlag::WatchingCutscene );
-
+  
   auto pEvent = getEvent( eventId );
-  if( !pEvent && getEventCount() )
-  {
-    // We're trying to play a nested event, need to start it first.
-    //eventStart( getId(), eventId, Event::EventHandler::Nest, 0, 0 );
-    //pEvent = getEvent( eventId );
-  }
-  else if( !pEvent )
+  if( !pEvent )
   {
     auto pLog = g_fw.get< Logger >();
     pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
     return nullptr;
   }
 
+  if( flags & 0x02 )
+    setStateFlag( PlayerStateFlag::WatchingCutscene );
+
   return pEvent;
 }
 
@@ -266,21 +261,6 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer )
       if( callback )
         callback( *this, pEvent->getActorId() );
 
-      auto events = eventList();
-
-      /*for( auto it : events )
-      {
-
-        if( it.second->hasPlayedScene() == false )
-        {
-          // TODO: not happy with this, this is also prone to break wit more than one remaining event in there
-          queuePacket( std::make_shared< EventFinishPacket >( getId(), it.second->getId(),
-                                                                it.second->getEventType(),
-                                                                it.second->getEventParam() ) );
-          removeEvent( it.second->getId() );
-        }
-      }*/
-
       break;
     }
     default: