more cleanups in fields in license