License + cleanup