Fixed distinct vertex issues, changed removal filters