Removing typedefs