rename
remove unused typedefs