Cleaned up user feed code