Removing unneeded typedefs