Clean up global typedefs