Removing non-needed typedefs.
Fixing a integral type conversion warning