Squash migrations and delete both former

6 jobs for 21-link-field-should-be-optional in 10 minutes and 39 seconds (queued for 6 seconds)