(misc) licensing cleanup