removed struct typedefs