Remove artifacts. Add disambiguation class