diff --git a/src/main/java/com/faf223/expensetrackerfaf/config/JwtAuthenticationFilter.java b/src/main/java/com/faf223/expensetrackerfaf/config/JwtAuthenticationFilter.java
index 9d710a2..848021f 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/config/JwtAuthenticationFilter.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/config/JwtAuthenticationFilter.java
@@ -62,7 +62,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
             response.setContentType("application/json");
 
             ErrorResponse errorResponse = new ErrorResponse("Your session has expired. Refresh your token.");
-            ObjectMapper objectMapper = new ObjectMapper(); // You may need to import ObjectMapper
+            ObjectMapper objectMapper = new ObjectMapper();
             response.getWriter().write(objectMapper.writeValueAsString(errorResponse));
 
 
diff --git a/src/main/java/com/faf223/expensetrackerfaf/config/JwtService.java b/src/main/java/com/faf223/expensetrackerfaf/config/JwtService.java
index 07b8f2c..d391d56 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/config/JwtService.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/config/JwtService.java
@@ -26,7 +26,6 @@ public class JwtService {
     private long jwtExpiration;
     @Value("${application.security.jwt.refresh-token.expiration}")
     private long refreshExpiration;
-//    private final AuthenticationService authenticationService;
 
 
     public String extractUsername(String token) {
diff --git a/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java b/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java
index e5f71b8..fcbac0e 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/config/SecurityConfiguration.java
@@ -45,22 +45,9 @@ public class SecurityConfiguration {
                 .cors(Customizer.withDefaults())
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(auth -> auth
-//                        .requestMatchers("/api/v1/auth/**").permitAll()
                         .anyRequest().authenticated()
                 )
                 .oauth2Login(withDefaults());
-//                .exceptionHandling(exceptionHandling ->
-//                        exceptionHandling
-//                                .authenticationEntryPoint(authenticationEntryPoint())
-//                )
-//                .oauth2Login(oauth2Login ->
-//                        oauth2Login
-//                                .loginPage("/login")
-//                                .clientRegistrationRepository(clientRegistrationRepository)
-//                                .userInfoEndpoint(userInfoEndpoint ->
-//                                        userInfoEndpoint.userService(oAuth2UserService())
-//                                )
-//                                .successHandler(jwtAuthenticationSuccessHandler()));
 
         return http.build();
     }
diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/AuthenticationService.java b/src/main/java/com/faf223/expensetrackerfaf/service/AuthenticationService.java
index 17534a1..6f1bf22 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/service/AuthenticationService.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/service/AuthenticationService.java
@@ -71,16 +71,15 @@ public class AuthenticationService {
                     .build();
         }
 
-        // Extract user details from OAuth2User
+
         String givenName = oAuth2User.getAttribute("given_name");
         String familyName = oAuth2User.getAttribute("family_name");
         String email = oAuth2User.getAttribute("email");
 
-        // Create a new User entity and save it to the database
         User user = User.builder()
                 .firstName(givenName)
                 .lastName(familyName)
-                .username(email) // You can adjust the username as needed
+                .username(email)
                 .build();
 
         String randomPassword = passwordGenerator.generateRandomPassword(8);
@@ -98,7 +97,6 @@ public class AuthenticationService {
         System.out.println("New user: " + user);
         System.out.println("New credentials: " + credential);
 
-        // Return the registered user's authentication response
         return AuthenticationResponse.builder()
                 .accessToken(jwtToken)
                 .refreshToken(refreshToken)