Fix feed links part 2

First commit removes the ability to turn off feeds. This fixes it plus more cleanup.