Some cleanup, added disable feeds plugin.