diff --git a/src/index.tsx b/src/index.tsx
index 0c33eac..539171c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -2562,6 +2562,8 @@ export type NotificationFilters = {
 export type NotificationGql = {
   __typename?: "NotificationGQL";
   actor: UserGql;
+  challenge?: Maybe<Challenge>;
+  challengeId?: Maybe<Scalars["Int"]["output"]>;
   comment?: Maybe<CommentGql>;
   createdAt: Scalars["DateTime"]["output"];
   id: Scalars["Int"]["output"];
@@ -2573,11 +2575,11 @@ export type NotificationGql = {
 };
 
 export enum NotificationTypeEnum {
+  ChallengeInvite = "CHALLENGE_INVITE",
   Comment = "COMMENT",
   CommentReply = "COMMENT_REPLY",
   Follow = "FOLLOW",
   Reaction = "REACTION",
-  ChallengeInvite = "CHALLENGE_INVITE",
 }
 
 export type OtherErrorNeedsNote = {
@@ -3657,49 +3659,6 @@ export type GetMyChallengeInvitationsQuery = {
   }>;
 };
 
-export type GetMyChallengeEntriesQueryVariables = Exact<{
-  [key: string]: never;
-}>;
-
-export type GetMyChallengeEntriesQuery = {
-  __typename?: "Query";
-  myChallengeEntries: Array<{
-    __typename?: "ChallengeEntry";
-    id: string;
-    status: string;
-    shotsCount?: number | null;
-    makesCount?: number | null;
-    makeRate?: number | null;
-    qualified?: boolean | null;
-    createdAt: any;
-    challenge: {
-      __typename?: "Challenge";
-      id: string;
-      name: string;
-      description?: string | null;
-      startDate: any;
-      endDate: any;
-      minimumShots: number;
-      requiredTableSize?: number | null;
-      requiredPocketSize?: number | null;
-      isPublic: boolean;
-      maxAttempts?: number | null;
-      ruleSet: { __typename?: "RuleSet"; id: string; name: string };
-      createdBy: {
-        __typename?: "UserGQL";
-        id: number;
-        username: string;
-        profileImageUri?: string | null;
-      };
-    };
-    video?: {
-      __typename?: "VideoGQL";
-      id: number;
-      createdAt?: any | null;
-    } | null;
-  }>;
-};
-
 export type CreateRuleSetMutationVariables = Exact<{
   name: Scalars["String"]["input"];
   description?: InputMaybe<Scalars["String"]["input"]>;
@@ -4252,7 +4211,6 @@ export type GetVideoFeedQuery = {
       hasNextPage: boolean;
       endCursor?: string | null;
     };
-    hasFollowing?: boolean | null;
   };
 };
 
@@ -4468,6 +4426,7 @@ export type GetNotificationsQuery = {
       id: number;
       notificationType: NotificationTypeEnum;
       videoId?: number | null;
+      challengeId?: number | null;
       reactionType?: string | null;
       isRead: boolean;
       createdAt: any;
@@ -4478,6 +4437,7 @@ export type GetNotificationsQuery = {
         username: string;
         profileImageUri?: string | null;
       };
+      challenge?: { __typename?: "Challenge"; id: string; name: string } | null;
       comment?: {
         __typename?: "CommentGQL";
         id: number;
@@ -4544,7 +4504,6 @@ export type NotificationFragment = {
   notificationType: NotificationTypeEnum;
   videoId?: number | null;
   challengeId?: number | null;
-  challenge?: { __typename?: "Challenge"; name: string } | null;
   reactionType?: string | null;
   isRead: boolean;
   createdAt: any;
@@ -4555,6 +4514,7 @@ export type NotificationFragment = {
     username: string;
     profileImageUri?: string | null;
   };
+  challenge?: { __typename?: "Challenge"; id: string; name: string } | null;
   comment?: {
     __typename?: "CommentGQL";
     id: number;
@@ -5466,14 +5426,12 @@ export type GetUserFollowingFollowersQuery = {
       id: number;
       username: string;
       profileImageUri?: string | null;
-      isFollowedByCurrentUser?: boolean | null;
     }> | null;
     followers?: Array<{
       __typename?: "UserGQL";
       id: number;
       username: string;
       profileImageUri?: string | null;
-      isFollowedByCurrentUser?: boolean | null;
     }> | null;
   } | null;
 };
@@ -6443,6 +6401,11 @@ export const NotificationFragmentDoc = gql`
       profileImageUri
     }
     videoId
+    challengeId
+    challenge {
+      id
+      name
+    }
     comment {
       id
       message
@@ -7197,109 +7160,6 @@ export type GetMyChallengeInvitationsQueryResult = Apollo.QueryResult<
   GetMyChallengeInvitationsQuery,
   GetMyChallengeInvitationsQueryVariables
 >;
-export const GetMyChallengeEntriesDocument = gql`
-  query GetMyChallengeEntries {
-    myChallengeEntries {
-      id
-      status
-      shotsCount
-      makesCount
-      makeRate
-      qualified
-      createdAt
-      challenge {
-        id
-        name
-        description
-        startDate
-        endDate
-        minimumShots
-        requiredTableSize
-        requiredPocketSize
-        isPublic
-        maxAttempts
-        ruleSet {
-          id
-          name
-        }
-        createdBy {
-          id
-          username
-          profileImageUri
-        }
-      }
-      video {
-        id
-        createdAt
-      }
-    }
-  }
-`;
-
-/**
- * __useGetMyChallengeEntriesQuery__
- *
- * To run a query within a React component, call `useGetMyChallengeEntriesQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetMyChallengeEntriesQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetMyChallengeEntriesQuery({
- *   variables: {
- *   },
- * });
- */
-export function useGetMyChallengeEntriesQuery(
-  baseOptions?: Apollo.QueryHookOptions<
-    GetMyChallengeEntriesQuery,
-    GetMyChallengeEntriesQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<
-    GetMyChallengeEntriesQuery,
-    GetMyChallengeEntriesQueryVariables
-  >(GetMyChallengeEntriesDocument, options);
-}
-export function useGetMyChallengeEntriesLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    GetMyChallengeEntriesQuery,
-    GetMyChallengeEntriesQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<
-    GetMyChallengeEntriesQuery,
-    GetMyChallengeEntriesQueryVariables
-  >(GetMyChallengeEntriesDocument, options);
-}
-export function useGetMyChallengeEntriesSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetMyChallengeEntriesQuery,
-    GetMyChallengeEntriesQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useSuspenseQuery<
-    GetMyChallengeEntriesQuery,
-    GetMyChallengeEntriesQueryVariables
-  >(GetMyChallengeEntriesDocument, options);
-}
-export type GetMyChallengeEntriesQueryHookResult = ReturnType<
-  typeof useGetMyChallengeEntriesQuery
->;
-export type GetMyChallengeEntriesLazyQueryHookResult = ReturnType<
-  typeof useGetMyChallengeEntriesLazyQuery
->;
-export type GetMyChallengeEntriesSuspenseQueryHookResult = ReturnType<
-  typeof useGetMyChallengeEntriesSuspenseQuery
->;
-export type GetMyChallengeEntriesQueryResult = Apollo.QueryResult<
-  GetMyChallengeEntriesQuery,
-  GetMyChallengeEntriesQueryVariables
->;
 export const CreateRuleSetDocument = gql`
   mutation CreateRuleSet($name: String!, $description: String) {
     createRuleSet(name: $name, description: $description) {
@@ -8225,7 +8085,6 @@ export const GetVideoFeedDocument = gql`
         hasNextPage
         endCursor
       }
-      hasFollowing
     }
   }
   ${VideoCardFieldsFragmentDoc}
@@ -11123,13 +10982,11 @@ export const GetUserFollowingFollowersDocument = gql`
         id
         username
         profileImageUri
-        isFollowedByCurrentUser
       }
       followers {
         id
         username
         profileImageUri
-        isFollowedByCurrentUser
       }
     }
   }