Merge "Removing unused typedefs."