Code cleanup
Add place for feeds to be run
Remove dead code