remove more useless typedefs