Removing extra typedef that causes build failures on earlier versions of gcc and removed TODO that was done.