Clean up feed...tests currently failing so this is very much WIP