Cleanup some dupes in releng/10.0 MOVED as well