Getting rid of some doubles