remove typedefs