Apply pending cleanup of contact fields

we added new versions of these columns with the intention of renaming
them, but didn't remove the old ones to avoid errors.

This cleans up the old versions of these columns.
Apply pending cleanup

We avoided a destructive migration by adding a new polymorphic
association without removing the existing normal association. We can now
remove the original column to clean up