Removed some unneeded typedefs