Remove more settings migration code that isn't necessary

See 612223ec3f05697f8bc629fb67ce59257cb30b79 for the first commit.