Remove redundant user address setup