removed unused typedefs