diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua
index d161f035c..f45f46116 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@@ -8,7 +8,6 @@ mobs.version = "20180531" -- don't rely too much on this, rarely updated, if eve
 local MAX_MOB_NAME_LENGTH = 30
 
 -- Localize
-local MP = minetest.get_modpath(minetest.get_current_modname())
 local S = minetest.get_translator("mcl_mobs")
 
 -- CMI support check
@@ -83,8 +82,6 @@ local stuck_timeout = 3 -- how long before mob gets stuck in place and starts se
 local stuck_path_timeout = 10 -- how long will mob follow path before giving up
 
 -- default nodes
-local node_fire = "mcl_fire:fire"
-local node_permanent_flame = "mcl_fire:eternal_fire"
 local node_ice = "mcl_core:ice"
 local node_snowblock = "mcl_core:snowblock"
 local node_snow = "mcl_core:snow"
@@ -340,7 +337,7 @@ end
 
 
 -- are we flying in what we are suppose to? (taikedz)
-local flight_check = function(self, pos_w)
+local flight_check = function(self)
 
 	local nod = self.standing_in
 	local def = minetest.registered_nodes[nod]
@@ -886,7 +883,7 @@ local do_jump = function(self)
 	local dir_z = cos(yaw) * (self.collisionbox[4] + 0.5)
 
 	-- what is in front of mob?
-	local nod = node_ok({
+	nod = node_ok({
 		x = pos.x + dir_x,
 		y = pos.y + 0.5,
 		z = pos.z + dir_z
@@ -1781,7 +1778,7 @@ local follow_flop = function(self)
 
 				if p.x > s.x then yaw = yaw + pi end
 
-				yaw = set_yaw(self, yaw, 6)
+				set_yaw(self, yaw, 6)
 
 				-- anyone but standing npc's can move along
 				if dist > self.reach
@@ -3825,9 +3822,6 @@ function mobs:protect(self, clicker)
 end
 
 
-local mob_obj = {}
-local mob_sta = {}
-
 -- feeding, taming and breeding (thanks blert2112)
 function mobs:feed_tame(self, clicker, feed_count, breed, tame)
 	if not self.follow then
diff --git a/mods/ENTITIES/mcl_mobs/mount.lua b/mods/ENTITIES/mcl_mobs/mount.lua
index d24fc26fe..a068131da 100644
--- a/mods/ENTITIES/mcl_mobs/mount.lua
+++ b/mods/ENTITIES/mcl_mobs/mount.lua
@@ -121,7 +121,7 @@ end)
 
 function mobs.attach(entity, player)
 
-	local attach_at, eye_offset = {}, {}
+	local attach_at, eye_offset
 
 	entity.player_rotation = entity.player_rotation or {x = 0, y = 0, z = 0}
 	entity.driver_attach_at = entity.driver_attach_at or {x = 0, y = 0, z = 0}
@@ -183,10 +183,10 @@ end
 
 function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
 
-	local rot_steer, rot_view = math.pi/2, 0
+	local rot_view = 0
 
 	if entity.player_rotation.y == 90 then
-		rot_steer, rot_view = 0, math.pi/2
+		rot_view = math.pi/2
 	end
 
 	local acce_y = 0
@@ -262,7 +262,7 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
 
 		return
 	end
-	
+
 	-- set moving animation
 	if moving_anim then
 		mobs:set_animation(entity, moving_anim)
@@ -293,7 +293,7 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
 
 	-- Set position, velocity and acceleration
 	local p = entity.object:get_pos()
-	local new_velo = {x = 0, y = 0, z = 0}
+	local new_velo
 	local new_acce = {x = 0, y = -9.8, z = 0}
 
 	p.y = p.y - 0.5
@@ -390,11 +390,6 @@ function mobs.fly(entity, dtime, speed, shoots, arrow, moving_anim, stand_anim)
 	local velo = entity.object:get_velocity()
 	local dir = entity.driver:get_look_dir()
 	local yaw = entity.driver:get_look_horizontal() + 1.57 -- offset fix between old and new commands
-	local rot_steer, rot_view = math.pi / 2, 0
-
-	if entity.player_rotation.y == 90 then
-		rot_steer, rot_view = 0, math.pi / 2
-	end
 
 	if ctrl.up then
 		entity.object:set_velocity({