Cleanup remaining traces of feed references
Merging changes