removed typedefs