Simplify license info. Remove advanced packaging.

Removing dual license info where not really needed.