Code cleanup, intented to remove the parseAddress routines from