Trait/type cleanup

Created by  pmeunier  on February 3, 2021
OTWDDJE7TTE73D6BGF4ZN6BH2NFUFLPME2VJ3CPALH463UGWLEIQC
Change contents