License clarification and cleanup