diff --git a/LeCountdown/Views/Countdown/NewCountdownView.swift b/LeCountdown/Views/Countdown/NewCountdownView.swift
index 9c2f7fc..ca7d49d 100644
--- a/LeCountdown/Views/Countdown/NewCountdownView.swift
+++ b/LeCountdown/Views/Countdown/NewCountdownView.swift
@@ -20,8 +20,6 @@ struct NewCountdownView : View {
     init(isPresented: Binding<Bool>) {
         _isPresented = isPresented
         self.userActivity = Shortcut.newCountdown.userActivity
-        
-//        let shortcut = INShortcut(userActivity: self.userActivity)
     }
     
     var body: some View {
@@ -94,7 +92,6 @@ struct CountdownEditView : View {
                         }
                     }
 
-                    
                     CountdownFormView(
                         focusedField: _focusedField,
                         nameBinding: $nameString,
@@ -103,7 +100,6 @@ struct CountdownEditView : View {
                         repeatCountBinding: $soundRepeatCount)
                     .environmentObject(self.model)
                     
-//                }
             .toolbar {
                     ToolbarItemGroup(placement: .keyboard) {
                         Button {
@@ -197,21 +193,6 @@ struct CountdownEditView : View {
     fileprivate func _loadCountdown(_ countdown: Countdown) {
         
         self.duration = countdown.duration
-        
-//        let hours = Int(countdown.duration / 3600.0)
-//        let minutes = Int(countdown.duration - Double(hours * 3600)) / 60
-//        let seconds = countdown.duration - Double(hours * 3600) - Double(minutes * 60)
-//
-//        if hours > 0 {
-//            self.hoursString = self._numberFormatter.string(from: NSNumber(value: hours)) ?? ""
-//        }
-//        if minutes > 0 {
-//            self.minutesString = self._numberFormatter.string(from: NSNumber(value: minutes)) ?? ""
-//        }
-//        if seconds > 0 {
-//            self.secondsString = self._numberFormatter.string(from: NSNumber(value: seconds)) ?? ""
-//        }
-        
         if let name = countdown.activity?.name, !name.isEmpty {
             self.nameString = name
         }
@@ -226,20 +207,6 @@ struct CountdownEditView : View {
             self.image = coolpic
         }
     }
-    
-//    fileprivate let _numberFormatter = NumberFormatter()
-//
-//    fileprivate var _seconds: Double {
-//        return self._numberFormatter.number(from: self.secondsString)?.doubleValue ?? 0.0
-//    }
-//
-//    fileprivate var _minutes: Double {
-//        return self._numberFormatter.number(from: self.minutesString)?.doubleValue ?? 0.0
-//    }
-//
-//    fileprivate var _hours: Double {
-//        return self._numberFormatter.number(from: self.hoursString)?.doubleValue ?? 0.0
-//    }
 
     fileprivate func _cancel() {
         self.viewContext.rollback()
@@ -255,7 +222,6 @@ struct CountdownEditView : View {
             cd = Countdown(context: viewContext)
         }
         
-//        cd.duration = self._hours * 3600.0 + self._minutes * 60.0 + self._seconds
         cd.duration = self.duration
         
         if self._isNewCountdown {
@@ -277,37 +243,34 @@ struct CountdownEditView : View {
         
         cd.image = self.image.rawValue
         cd.playableIds = self.model.soundModel.playableIds
-        
         cd.setConfirmationSounds(self.model.confirmationSoundModel.sounds)
-        
         cd.repeatCount = self.soundRepeatCount
         
         if !self.nameString.isEmpty {
             
             let trimmed = self.nameString.trimmingCharacters(in: .whitespacesAndNewlines)
+            cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed)
             
-            if let activity = cd.activity, let currentActivityName = activity.name, trimmed != currentActivityName {
-                
-                switch self._rename {
-                case .none:
-                    self.activityNameConfirmationShown = true
-                    return
-                case .some(let rename):
-                    if rename {
-                        activity.name = trimmed
-                    } else {
-                        cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed)
-                    }
-                }
-            } else {
-                cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed)
-            }
+//            if let activity = cd.activity, let currentActivityName = activity.name, trimmed != currentActivityName {
+//
+//                switch self._rename {
+//                case .none:
+//                    self.activityNameConfirmationShown = true
+//                    return
+//                case .some(let rename):
+//                    if rename {
+//                        activity.name = trimmed
+//                    } else {
+//                        cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed)
+//                    }
+//                }
+//            } else {
+//                cd.activity = CoreDataRequests.getOrCreateActivity(name: trimmed)
+//            }
         }
         
         self._saveContext()
-        
         WidgetCenter.shared.reloadAllTimelines() // refreshes the visual of existing widgets
-        
         self._popOrDismiss()
     }
     
@@ -333,7 +296,6 @@ struct CountdownEditView : View {
         WidgetCenter.shared.reloadAllTimelines() // refreshes the visual of existing widgets
 
         self._popOrDismiss()
-        
     }
     
     fileprivate func _saveContext() {
diff --git a/LeCountdown/Views/Stopwatch/NewStopwatchView.swift b/LeCountdown/Views/Stopwatch/NewStopwatchView.swift
index 5fc9654..b7cd764 100644
--- a/LeCountdown/Views/Stopwatch/NewStopwatchView.swift
+++ b/LeCountdown/Views/Stopwatch/NewStopwatchView.swift
@@ -185,41 +185,28 @@ struct StopwatchEditView: View {
 
         sw.playableIds = self.model.soundModel.playableIds
         sw.confirmationSoundList = self.model.confirmationSoundModel.playableIds
-        
-//        sw.setConfirmationSounds(self.model.confirmationSoundModel.sounds)
-
-        
-//        if self._isAdding {
-//            let max = self.countdowns.map { $0.order }.max() ?? 0
-//            cd.order = max + 1
-//        }
-        
         sw.image = self.image.rawValue
         
-//        if self.playSound {
-//            sw.sound = Int16(self.sound.rawValue)
-//        } else {
-////            sw.sound = nil
-//        }
-        
         if !self.nameString.isEmpty {
             
-            if let activity = sw.activity, let currentActivityName = activity.name, self.nameString != currentActivityName {
-                
-                switch self._rename {
-                case .none:
-                    self.activityNameConfirmationShown = true
-                    return
-                case .some(let rename):
-                    if rename {
-                        activity.name = self.nameString
-                    } else {
-                        sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString)
-                    }
-                }
-            } else {
-                sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString)
-            }
+            sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString)
+
+//            if let activity = sw.activity, let currentActivityName = activity.name, self.nameString != currentActivityName {
+//
+//                switch self._rename {
+//                case .none:
+//                    self.activityNameConfirmationShown = true
+//                    return
+//                case .some(let rename):
+//                    if rename {
+//                        activity.name = self.nameString
+//                    } else {
+//                        sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString)
+//                    }
+//                }
+//            } else {
+//                sw.activity = CoreDataRequests.getOrCreateActivity(name: self.nameString)
+//            }
             
         }