Clean up feed handling a bit. Not totally convinced. Needs review
Removed unused import