cleanup typedefs