Removed unnecessary typedefs