Remove typedef handling
Clean unittest code
Merge pull request #2577 from 9rnsr/remove_typedef

Remove code for typedef