Remove unneeded type-defs