remove unnecessary typedefs