Combine drop column migrations
Combine drop column migrations

One migration was to drop keys and allow nulls, and the other was to
drop the columns, the idea was to have the columns allow nulls
update the code, and then drop the columns, but it became frustrating to
deal with, so it's all combined now.

iFixit/pulldasher,iFixit/pulldasher,iFixit/pulldasher,iFixit/pulldasher