Cleaning up in order to sync staging and dev.
Merge branch 'hotfix/remove-feeds'