license cleanup
merge 8c204ad8c6b0aaab41c8212cc5545fc9fd5be05c