#184 removing unneeded state+zip 2nd time