clean up & change licence model