remove GenericHandle and TypedHandle