Removed the addressfield in the wrong place