Cleaned up feeds functionality