[FIX,INTERNAL] removed unnecessary typedefs