diff --git a/include/client/world.h b/include/client/world.h
index e96ec48e3..2e1f79107 100644
--- a/include/client/world.h
+++ b/include/client/world.h
@@ -66,7 +66,6 @@ void CL_ParseBaseline (struct msg_s *msg, struct entity_state_s *baseline,
 void CL_ParseStatic (struct msg_s *msg, int version);
 void CL_MapCfg (const char *mapname);
 void CL_World_NewMap (const char *mapname, const char *skyname);
-void CL_LoadLights (struct model_s *model, const char *entity_data,
-					struct lightingdata_s *ldata);
+void CL_LoadLights (struct plitem_s *entities, struct scene_s *scene);
 
 #endif//__client_world_h
diff --git a/libs/client/cl_light.c b/libs/client/cl_light.c
index 8aa9cb39c..ecb946956 100644
--- a/libs/client/cl_light.c
+++ b/libs/client/cl_light.c
@@ -9,9 +9,9 @@
 #include "QF/model.h"
 #include "QF/plist.h"
 #include "QF/progs.h"	//for ED_ConvertToPlist
-#include "QF/script.h"
 #include "QF/set.h"
 #include "QF/scene/light.h"
+#include "QF/scene/scene.h"
 #include "QF/simd/vec4f.h"
 
 #include "client/world.h"
@@ -238,78 +238,59 @@ locate_lights (model_t *model, lightingdata_t *ldata)
 }
 
 void
-CL_LoadLights (model_t *model, const char *entity_data, lightingdata_t *ldata)
+CL_LoadLights (plitem_t *entities, scene_t *scene)
 {
-	plitem_t   *entities = 0;
+	lightingdata_t *ldata = scene->lights;
+	model_t    *model = scene->worldmodel;
 
-	if (!entity_data) {
+	Light_ClearLights (ldata);
+	ldata->sun_pvs = set_new_size (model->brush.visleafs);
+	if (!entities) {
 		return;
 	}
 
-	Light_ClearLights (ldata);
+	plitem_t   *targets = PL_NewDictionary (0);
 
-	ldata->sun_pvs = set_new_size (model->brush.visleafs);
-
-	script_t   *script = Script_New ();
-	Script_Start (script, "ent data", entity_data);
-
-	if (Script_GetToken (script, 1)) {
-		if (!strcmp (script->token->str, "(")) {
-			// new style (plist) entity data
-			entities = PL_GetPropertyList (entity_data, 0);
-		} else {
-			// old style entity data
-			Script_UngetToken (script);
-			// FIXME ED_ConvertToPlist aborts if an error is encountered.
-			entities = ED_ConvertToPlist (script, 0, 0);
+	// find all the targets so spotlights can be aimed
+	for (int i = 1; i < PL_A_NumObjects (entities); i++) {
+		plitem_t   *entity = PL_ObjectAtIndex (entities, i);
+		const char *targetname = PL_String (PL_ObjectForKey (entity,
+															 "targetname"));
+		if (targetname && !PL_ObjectForKey (targets, targetname)) {
+			PL_D_AddObject (targets, targetname, entity);
 		}
 	}
-	Script_Delete (script);
 
-	if (entities) {
-		plitem_t   *targets = PL_NewDictionary (0);
+	for (int i = 0; i < PL_A_NumObjects (entities); i++) {
+		plitem_t   *entity = PL_ObjectAtIndex (entities, i);
+		const char *classname = PL_String (PL_ObjectForKey (entity,
+															"classname"));
+		if (!classname) {
+			continue;
+		}
+		if (!strcmp (classname, "worldspawn")) {
+			// parse_sun can add many lights
+			parse_sun (ldata, entity);
+		} else if (!strncmp (classname, "light", 5)) {
+			light_t     light = {};
+			int         style = 0;
 
-		// find all the targets so spotlights can be aimed
-		for (int i = 1; i < PL_A_NumObjects (entities); i++) {
-			plitem_t   *entity = PL_ObjectAtIndex (entities, i);
-			const char *targetname = PL_String (PL_ObjectForKey (entity,
-																 "targetname"));
-			if (targetname && !PL_ObjectForKey (targets, targetname)) {
-				PL_D_AddObject (targets, targetname, entity);
+			parse_light (&light, &style, entity, targets);
+			// some lights have 0 output, so drop them
+			if (light.color[3]) {
+				DARRAY_APPEND (&ldata->lights, light);
+				DARRAY_APPEND (&ldata->lightstyles, style);
 			}
 		}
-
-		for (int i = 0; i < PL_A_NumObjects (entities); i++) {
-			plitem_t   *entity = PL_ObjectAtIndex (entities, i);
-			const char *classname = PL_String (PL_ObjectForKey (entity,
-																"classname"));
-			if (!classname) {
-				continue;
-			}
-			if (!strcmp (classname, "worldspawn")) {
-				// parse_sun can add many lights
-				parse_sun (ldata, entity);
-			} else if (!strncmp (classname, "light", 5)) {
-				light_t     light = {};
-				int         style = 0;
-
-				parse_light (&light, &style, entity, targets);
-				// some lights have 0 output, so drop them
-				if (light.color[3]) {
-					DARRAY_APPEND (&ldata->lights, light);
-					DARRAY_APPEND (&ldata->lightstyles, style);
-				}
-			}
-		}
-		DARRAY_RESIZE (&ldata->lightvis, ldata->lights.size);
-		// targets does not own the objects, so need to remove them before
-		// freeing targets
-		for (int i = PL_D_NumKeys (targets); i-- > 0; ) {
-			PL_RemoveObjectForKey (targets, PL_KeyAtIndex (targets, i));
-		}
-		PL_Free (targets);
-		PL_Free (entities);
 	}
+	DARRAY_RESIZE (&ldata->lightvis, ldata->lights.size);
+	// targets does not own the objects, so need to remove them before
+	// freeing targets
+	for (int i = PL_D_NumKeys (targets); i-- > 0; ) {
+		PL_RemoveObjectForKey (targets, PL_KeyAtIndex (targets, i));
+	}
+	PL_Free (targets);
+
 	if (ldata->lights.size) {
 		locate_lights (model, ldata);
 		for (size_t i = 0; i < ldata->lights.size; i++) {
diff --git a/libs/client/cl_world.c b/libs/client/cl_world.c
index 1bcb256fa..4d17b0f5c 100644
--- a/libs/client/cl_world.c
+++ b/libs/client/cl_world.c
@@ -212,12 +212,6 @@ CL_World_NewMap (const char *mapname, const char *skyname)
 
 	cl_static_entities.size = 0;
 
-	const char *entity_data = worldmodel->brush.entities;
-	CL_LoadLights (worldmodel, entity_data, cl_world.scene->lights);
-
-	cl_world.scene->models = cl_world.models.a;
-	cl_world.scene->num_models = cl_world.models.size;
-	SCR_NewScene (cl_world.scene);
 	if (cl_world.models.a[1] && cl_world.models.a[1]->brush.entities) {
 		if (cl_world.edicts) {
 			PL_Free (cl_world.edicts);
@@ -229,5 +223,10 @@ CL_World_NewMap (const char *mapname, const char *skyname)
 			Fog_ParseWorldspawn (cl_world.worldspawn);
 		}
 	}
+	CL_LoadLights (cl_world.edicts, cl_world.scene);
+
+	cl_world.scene->models = cl_world.models.a;
+	cl_world.scene->num_models = cl_world.models.size;
+	SCR_NewScene (cl_world.scene);
 	map_cfg (mapname, 1);
 }