Remove typedefs - let nme do these