More duplication removal