Cleanup mobs code