type definition cleanup