another DiscriminatorEntry cleanup