Licence cleanup