get rid of those duplicated type definitions
commit the snapshoted changes