more cleanup. removed dupes