cleanup, fixed dupes