Remove accidental commit of schema change that isn't yet in the migrations
Add more indexes on id columns that somehow missed earlier