Removing unused typedefs