License cleanups
Cleanups