Remove address fields

This removes the address fields and replaces them with locations.