License clean-up