Licensing / comments cleanup