Removing Radius, Azimuth and StreetAddress to match latest draft