Refactored license preferences.

Also removed a lot of config funging that seems useless now

Change-Id: I24b1e7ff15ddac3f0ac0d08b122d74aa2149f19b