unambiguous cleanup to contains - ignore holes