Remove trailing underscores from _type_