Remove redundant preferences part 1

This is the first part of the preference cleanup... there are still a few more left to do, but I think I'll do them later as another pull request