Remove extra typedefs since they do not seem to be needed anymore