Removed crufty return address code