Gnat uses new LUS + cleanup