Cleaning up so feed item is authority on where things are stored