Lime updated + cleanup