Remove unnecessary typedefs