more clean up and removed duplicates