clean up organization and remove dupes