Index: ChapterX.Infrastructure/Repositories/AISuggestionRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/AISuggestionRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/AISuggestionRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -21,6 +21,5 @@
         {
             return await _dbSet
-                .Include(a => a.SuggestionTypes)
-                .Where(a => a.NeedApprovals.Any(na => na.ChapterId == chapterId))
+                .Where(a => a.StoryId == chapterId)
                 .ToListAsync(cancellationToken);
         }
Index: ChapterX.Infrastructure/Repositories/ChapterRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/ChapterRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/ChapterRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -24,18 +24,4 @@
                 .ToListAsync(cancellationToken);
         }
-
-        public async Task<Chapter?> GetByIdWithStoryAsync(int id, CancellationToken cancellationToken = default)
-        {
-            return await _dbSet
-                .Include(c => c.Story)
-                .FirstOrDefaultAsync(c => c.Id == id, cancellationToken);
-        }
-
-        public async Task IncrementViewCountAsync(int id, CancellationToken cancellationToken = default)
-        {
-            await _dbSet
-                .Where(c => c.Id == id)
-                .ExecuteUpdateAsync(s => s.SetProperty(c => c.ViewCount, c => c.ViewCount + 1), cancellationToken);
-        }
     }
 }
Index: ChapterX.Infrastructure/Repositories/CollaborationRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/CollaborationRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/CollaborationRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -2,5 +2,9 @@
 using ChapterX.Domain.Repositories;
 using ChapterX.Infrastructure.Data.DataContext;
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ChapterX.Infrastructure.Repositories
@@ -11,18 +15,4 @@
         {
         }
-
-        public override async Task<IEnumerable<Collaboration>> GetAllAsync(CancellationToken cancellationToken = default)
-            => await _dbSet
-                .Include(c => c.User)
-                .ToListAsync(cancellationToken);
-
-        public async Task<bool> DeleteByUserAndStoryAsync(int userId, int storyId, CancellationToken cancellationToken = default)
-        {
-            var collab = await _dbSet.FirstOrDefaultAsync(c => c.UserId == userId && c.StoryId == storyId, cancellationToken);
-            if (collab == null) return false;
-            _dbSet.Remove(collab);
-            await _context.SaveChangesAsync(cancellationToken);
-            return true;
-        }
     }
 }
Index: ChapterX.Infrastructure/Repositories/CommentRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/CommentRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/CommentRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -19,12 +19,9 @@
 
         public async Task<IEnumerable<Comment>> GetByChapterIdAsync(int chapterId, CancellationToken cancellationToken = default)
-            => await _dbSet.Where(c => c.StoryId == chapterId).ToListAsync(cancellationToken);
-
-        public async Task<IEnumerable<Comment>> GetByStoryIdAsync(int storyId, CancellationToken cancellationToken = default)
-            => await _dbSet
-                .Include(c => c.User)
-                .Where(c => c.StoryId == storyId)
-                .OrderByDescending(c => c.CreatedAt)
+        {
+            return await _dbSet
+                .Where(c => c.StoryId == chapterId)
                 .ToListAsync(cancellationToken);
+        }
     }
 }
Index: ChapterX.Infrastructure/Repositories/GenericRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/GenericRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/GenericRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -18,8 +18,8 @@
         }
 
-        public virtual async Task<T?> GetByIdAsync(int id, CancellationToken cancellationToken = default)
+        public async Task<T?> GetByIdAsync(int id, CancellationToken cancellationToken = default)
             => await _dbSet.FindAsync([id], cancellationToken);
 
-        public virtual async Task<IEnumerable<T>> GetAllAsync(CancellationToken cancellationToken = default)
+        public async Task<IEnumerable<T>> GetAllAsync(CancellationToken cancellationToken = default)
             => await _dbSet.ToListAsync(cancellationToken);
 
Index: ChapterX.Infrastructure/Repositories/LikesRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/LikesRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/LikesRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -2,5 +2,9 @@
 using ChapterX.Domain.Repositories;
 using ChapterX.Infrastructure.Data.DataContext;
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ChapterX.Infrastructure.Repositories
@@ -11,19 +15,4 @@
         {
         }
-
-        public async Task<IEnumerable<Likes>> GetByStoryIdAsync(int storyId, CancellationToken cancellationToken = default)
-            => await _dbSet.Where(l => l.StoryId == storyId).ToListAsync(cancellationToken);
-
-        public async Task<bool> ExistsAsync(int userId, int storyId, CancellationToken cancellationToken = default)
-            => await _dbSet.AnyAsync(l => l.UserId == userId && l.StoryId == storyId, cancellationToken);
-
-        public async Task<bool> DeleteByUserAndStoryAsync(int userId, int storyId, CancellationToken cancellationToken = default)
-        {
-            var like = await _dbSet.FirstOrDefaultAsync(l => l.UserId == userId && l.StoryId == storyId, cancellationToken);
-            if (like == null) return false;
-            _dbSet.Remove(like);
-            await _context.SaveChangesAsync(cancellationToken);
-            return true;
-        }
     }
 }
Index: ChapterX.Infrastructure/Repositories/NotificationRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/NotificationRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/NotificationRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -15,8 +15,7 @@
         // This method returns all notifications; adjust filter when a User relation is added.
         public async Task<IEnumerable<Notification>> GetByUserIdAsync(int userId, CancellationToken cancellationToken = default)
-            => await _dbSet
-                .Where(n => n.RecipientUserId == userId)
-                .OrderByDescending(n => n.CreatedAt)
-                .ToListAsync(cancellationToken);
+        {
+            return await _dbSet.ToListAsync(cancellationToken);
+        }
     }
 }
Index: ChapterX.Infrastructure/Repositories/ReadingListItemsRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/ReadingListItemsRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/ReadingListItemsRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -2,5 +2,9 @@
 using ChapterX.Domain.Repositories;
 using ChapterX.Infrastructure.Data.DataContext;
-using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ChapterX.Infrastructure.Repositories
@@ -11,16 +15,4 @@
         {
         }
-
-        public async Task<bool> ExistsAsync(int listId, int storyId, CancellationToken cancellationToken = default)
-            => await _dbSet.AnyAsync(i => i.ListId == listId && i.StoryId == storyId, cancellationToken);
-
-        public async Task<bool> DeleteByListAndStoryAsync(int listId, int storyId, CancellationToken cancellationToken = default)
-        {
-            var item = await _dbSet.FirstOrDefaultAsync(i => i.ListId == listId && i.StoryId == storyId, cancellationToken);
-            if (item == null) return false;
-            _dbSet.Remove(item);
-            await _context.SaveChangesAsync(cancellationToken);
-            return true;
-        }
     }
 }
Index: ChapterX.Infrastructure/Repositories/ReadingListRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/ReadingListRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/ReadingListRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -12,32 +12,8 @@
         }
 
-        public override async Task<IEnumerable<ReadingList>> GetAllAsync(CancellationToken cancellationToken = default)
-        {
-            return await _dbSet
-                .Include(r => r.User)
-                .Include(r => r.ReadingListItems)
-                    .ThenInclude(i => i.Story)
-                        .ThenInclude(s => s.Writer)
-                            .ThenInclude(w => w!.User)
-                .Include(r => r.ReadingListItems)
-                    .ThenInclude(i => i.Story)
-                        .ThenInclude(s => s.HasGenres)
-                            .ThenInclude(hg => hg.Genre)
-                .ToListAsync(cancellationToken);
-        }
-
         public async Task<IEnumerable<ReadingList>> GetByUserIdAsync(int userId, CancellationToken cancellationToken = default)
         {
             return await _dbSet
                 .Where(r => r.UserId == userId)
-                .Include(r => r.User)
-                .Include(r => r.ReadingListItems)
-                    .ThenInclude(i => i.Story)
-                        .ThenInclude(s => s.Writer)
-                            .ThenInclude(w => w!.User)
-                .Include(r => r.ReadingListItems)
-                    .ThenInclude(i => i.Story)
-                        .ThenInclude(s => s.HasGenres)
-                            .ThenInclude(hg => hg.Genre)
                 .ToListAsync(cancellationToken);
         }
Index: ChapterX.Infrastructure/Repositories/StoryRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/StoryRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/StoryRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -12,30 +12,4 @@
         }
 
-        public override async Task<IEnumerable<Story>> GetAllAsync(CancellationToken cancellationToken = default)
-        {
-            return await _dbSet
-                .Include(s => s.HasGenres)
-                    .ThenInclude(hg => hg.Genre)
-                .Include(s => s.Writer)
-                    .ThenInclude(w => w!.User)
-                .Include(s => s.Likes)
-                .Include(s => s.Comments)
-                .Include(s => s.Chapters)
-                .ToListAsync(cancellationToken);
-        }
-
-        public override async Task<Story?> GetByIdAsync(int id, CancellationToken cancellationToken = default)
-        {
-            return await _dbSet
-                .Include(s => s.HasGenres)
-                    .ThenInclude(hg => hg.Genre)
-                .Include(s => s.Writer)
-                    .ThenInclude(w => w!.User)
-                .Include(s => s.Likes)
-                .Include(s => s.Comments)
-                .Include(s => s.Chapters)
-                .FirstOrDefaultAsync(s => s.Id == id, cancellationToken);
-        }
-
         public async Task<IEnumerable<Story>> GetByWriterIdAsync(int writerId, CancellationToken cancellationToken = default)
         {
Index: ChapterX.Infrastructure/Repositories/UserRepository.cs
===================================================================
--- ChapterX.Infrastructure/Repositories/UserRepository.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.Infrastructure/Repositories/UserRepository.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -12,16 +12,6 @@
         }
 
-        public override async Task<IEnumerable<User>> GetAllAsync(CancellationToken cancellationToken = default)
-            => await _dbSet
-                .Include(u => u.Admin)
-                .Include(u => u.Writer)
-                .ToListAsync(cancellationToken);
-
         public async Task<User?> GetByEmailAsync(string email, CancellationToken cancellationToken = default)
-            => await _dbSet
-                .Include(u => u.Admin)
-                .Include(u => u.Writer)
-                .Include(u => u.RegularUser)
-                .FirstOrDefaultAsync(u => u.Email == email, cancellationToken);
+            => await _dbSet.FirstOrDefaultAsync(u => u.Email == email, cancellationToken);
 
         public async Task<User?> GetByUsernameAsync(string username, CancellationToken cancellationToken = default)