license + usage cleanup