Address location type cleanup