got rid of some unneeded duplicates