Remove descriptor-based implementation.