licensing cleanup