diff --git a/src/app.rs b/src/app.rs
index f510bff..f39baf6 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -199,10 +199,12 @@ impl eframe::App for EmApp {
                                     |sel| {
                                         format!(
                                             "[{}s,{}s)/{}s",
-                                            Duration::from_micros(sel.from as u64).as_secs(),
-                                            Duration::from_micros(sel.to as u64).as_secs(),
-                                            Duration::from_micros(sel.length().abs() as u64)
-                                                .as_secs()
+                                            Duration::from_micros(sel.start as u64).as_secs(),
+                                            Duration::from_micros(sel.end as u64).as_secs(),
+                                            Duration::from_micros(
+                                                (sel.end - sel.start).abs() as u64
+                                            )
+                                            .as_secs()
                                         )
                                     },
                                 ),
diff --git a/src/main.rs b/src/main.rs
index 1d7b62a..847a30c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,7 +18,6 @@ mod midi_vst;
 mod project;
 mod stave;
 mod track;
-mod track_edit;
 mod track_history;
 mod track_source;
 mod util;
diff --git a/src/stave.rs b/src/stave.rs
index 8540c90..5c6f9d9 100644
--- a/src/stave.rs
+++ b/src/stave.rs
@@ -19,7 +19,6 @@ use crate::edit_commands::{
 use crate::track::{
     export_smf, EventId, Level, Pitch, Track, TrackEvent, TrackEventType, MIDI_CC_SUSTAIN_ID,
 };
-use crate::track_edit::TimeSelection;
 use crate::track_history::TrackHistory;
 use crate::{util, Pix};
 
@@ -45,7 +44,7 @@ fn key_line_ys(view_y_range: &Rangef, pitches: Range<Pitch>) -> (BTreeMap<Pitch,
 
 #[derive(Debug)]
 pub struct NoteDraw {
-    time: TimeSelection,
+    time: Range<Time>,
     pitch: Pitch,
 }
 
@@ -142,7 +141,7 @@ pub struct Stave {
 
     pub cursor_position: Time,
     pub bookmarks: Bookmarks,
-    pub time_selection: Option<TimeSelection>,
+    pub time_selection: Option<Range<Time>>,
     pub note_draw: Option<NoteDraw>,
     pub note_selection: NotesSelection,
 }
@@ -220,10 +219,7 @@ impl Stave {
         );
     }
 
-    const NOTHING_ZONE: TimeSelection = TimeSelection {
-        from: Time::MIN,
-        to: 0,
-    };
+    const NOTHING_ZONE: Range<Time> = Time::MIN..0;
 
     fn view(&mut self, ui: &mut Ui) -> InnerResponse {
         Frame::none()
@@ -292,7 +288,7 @@ impl Stave {
                     self.draw_note(
                         &painter,
                         64,
-                        (new_note.time.from, new_note.time.to),
+                        (new_note.time.start, new_note.time.end),
                         *key_ys.get(&new_note.pitch).unwrap(),
                         half_tone_step,
                         true,
@@ -434,7 +430,7 @@ impl Stave {
         }) {
             if let Some(time_selection) = &self.time_selection {
                 self.history.update_track(|track| {
-                    tape_delete(track, &(time_selection.from, time_selection.to))
+                    tape_delete(track, &(time_selection.start, time_selection.end))
                 });
             }
             if !self.note_selection.selected.is_empty() {
@@ -451,8 +447,9 @@ impl Stave {
             ))
         }) {
             if let Some(time_selection) = &self.time_selection {
-                self.history
-                    .update_track(|_track| tape_insert(&(time_selection.from, time_selection.to)));
+                self.history.update_track(|_track| {
+                    tape_insert(&(time_selection.start, time_selection.end))
+                });
             }
         }
 
@@ -642,17 +639,14 @@ impl Stave {
             self.time_selection = None;
         } else if response.drag_started_by(drag_button) {
             if let Some(time) = time {
-                self.time_selection = Some(TimeSelection {
-                    from: *time,
-                    to: *time,
-                });
+                self.time_selection = Some(*time..*time);
             }
         } else if response.drag_released_by(drag_button) {
             // Just documenting how it can be handled
         } else if response.dragged_by(drag_button) {
             if let Some(time) = time {
                 if let Some(selection) = &mut self.time_selection {
-                    selection.to = *time;
+                    selection.end = *time;
                 }
             }
         }
@@ -674,10 +668,7 @@ impl Stave {
             if let Some(time) = time {
                 if let Some(pitch) = pitch {
                     self.note_draw = Some(NoteDraw {
-                        time: TimeSelection {
-                            from: *time,
-                            to: *time,
-                        },
+                        time: *time..*time,
                         pitch: *pitch,
                     });
                 }
@@ -686,7 +677,7 @@ impl Stave {
             dbg!("drag_released", &self.note_draw);
             if let Some(draw) = &mut self.note_draw {
                 if !draw.time.is_empty() {
-                    let time_range = (draw.time.from, draw.time.to);
+                    let time_range = (draw.time.start, draw.time.end);
                     let id_seq = &self.history.id_seq.clone();
                     self.history.update_track(|track: &Track| {
                         if draw.pitch == PIANO_DAMPER_LINE {
@@ -705,7 +696,7 @@ impl Stave {
         } else if response.dragged_by(drag_button) {
             if let Some(time) = time {
                 if let Some(draw) = &mut self.note_draw {
-                    draw.time.to = *time;
+                    draw.time.end = *time;
                 }
             }
         }
@@ -782,20 +773,15 @@ impl Stave {
         }
     }
 
-    pub fn draw_time_selection(
-        &self,
-        painter: &Painter,
-        selection: &TimeSelection,
-        color: &Color32,
-    ) {
+    pub fn draw_time_selection(&self, painter: &Painter, selection: &Range<Time>, color: &Color32) {
         let clip = painter.clip_rect();
         let area = Rect {
             min: Pos2 {
-                x: self.x_from_time(selection.from),
+                x: self.x_from_time(selection.start),
                 y: clip.min.y,
             },
             max: Pos2 {
-                x: self.x_from_time(selection.to),
+                x: self.x_from_time(selection.end),
                 y: clip.max.y,
             },
         };
diff --git a/src/track_edit.rs b/src/track_edit.rs
deleted file mode 100644
index 64519cb..0000000
--- a/src/track_edit.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-//   It is possible to not use id generator here, by having some id-placeholder value.
-
-// TODO (cleanup) Remove unused parts from here. Most of the functions here are replaced by edit_commands.
-use crate::common::Time;
-
-// use std::collections::HashSet;
-// use crate::changeset::{Changeset, EventAction, EventFn};
-// use crate::track::{
-//     is_cc_switch_on, ControllerId, ControllerSetValue, EventId, Level, Note, Pitch, Track,
-//     TrackEvent, TrackEventType, MAX_LEVEL, MIDI_CC_SUSTAIN_ID,
-// };
-// use crate::util;
-// use crate::util::{range_contains, IdSeq};
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TimeSelection {
-    pub from: Time,
-    pub to: Time,
-}
-
-impl TimeSelection {
-    pub fn length(&self) -> Time {
-        self.to - self.from
-    }
-
-    pub fn contains(&self, at: Time) -> bool {
-        self.from <= at && at < self.to
-    }
-
-    pub fn before(&self, at: Time) -> bool {
-        self.to <= at
-    }
-
-    pub fn after_start(&self, at: Time) -> bool {
-        self.from <= at
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.to - self.from <= 0
-    }
-}
-
-// pub fn add_note(
-//     track: &mut Track,
-//     changeset: &mut Changeset,
-//     time_range: (Time, Time),
-//     pitch: Pitch,
-//     level: Level,
-// ) {
-//     changeset.add(EventAction::Insert(TrackEvent {
-//         id: track.id_seq.borrow_mut().next(),
-//         at: time_range.0,
-//         event: TrackEventType::Note(Note {
-//             pitch,
-//             velocity: level,
-//             duration: time_range.1 - time_range.0,
-//         }),
-//     }));
-// }
-//
-// pub fn edit_events<Selector: Fn(&TrackEvent) -> bool>(
-//     track: &mut Track,
-//     changeset: &mut Changeset,
-//     selector: &Selector,
-//     action: &EventFn,
-// ) {
-//     for ev in &mut track.events {
-//         if selector(&ev) {
-//             if let Some(a) = action(&ev) {
-//                 changeset.add(a);
-//             }
-//         }
-//     }
-// }
-//
-// pub fn delete_events(track: &mut Track, changeset: &mut Changeset, event_ids: &HashSet<EventId>) {
-//     edit_events(track, changeset, &|ev| event_ids.contains(&ev.id), &|ev| {
-//         Some(EventAction::Delete(ev.clone()))
-//     });
-// }
-//
-// pub fn tape_cut(track: &mut Track, changeset: &mut Changeset, time_selection: &TimeSelection) {
-//     dbg!("tape_cut", time_selection);
-//     edit_events(
-//         track,
-//         changeset,
-//         &|ev| time_selection.contains(ev.at),
-//         &|ev| Some(EventAction::Delete(ev.clone())),
-//     );
-//     shift_events(
-//         track,
-//         changeset,
-//         &|ev| time_selection.before(ev.at),
-//         -(time_selection.length() as i64),
-//     );
-// }
-//
-// pub fn shift_events<Pred: Fn(&TrackEvent) -> bool>(
-//     track: &mut Track,
-//     changeset: &mut Changeset,
-//     selector: &Pred,
-//     d: i64,
-// ) {
-//     edit_events(track, changeset, selector, &move |ev| {
-//         let mut nev = ev.clone();
-//         nev.at += d;
-//         Some(EventAction::Update(ev.clone(), nev))
-//     });
-// }
-//
-// pub fn tape_insert(track: &mut Track, changeset: &mut Changeset, time_selection: &TimeSelection) {
-//     dbg!("tape_insert", time_selection);
-//     shift_events(
-//         track,
-//         changeset,
-//         &|ev| time_selection.after_start(ev.at),
-//         time_selection.length() as i64,
-//     );
-// }
-//
-// pub fn shift_tail(track: &mut Track, changeset: &mut Changeset, at: &Time, dt: i64) {
-//     dbg!("tail_shift", at, dt);
-//     shift_events(track, changeset, &|ev| &ev.at >= at, dt);
-// }
-//
-// fn clear_cc_events(
-//     track: &mut Track,
-//     changeset: &mut Changeset,
-//     time_range: util::Range<Time>,
-//     cc_id: ControllerId,
-// ) {
-//     for ev in &track.events {
-//         if range_contains(&time_range, ev.at) {
-//             if let TrackEventType::Controller(cc) = &ev.event {
-//                 if cc.controller_id == cc_id {
-//                     changeset.add(EventAction::Delete(ev.clone()));
-//                 }
-//             }
-//         }
-//     }
-// }
-//
-// fn sustain_event(id_seq: &mut IdSeq, at: &Time, on: bool) -> TrackEvent {
-//     TrackEvent {
-//         id: id_seq.next(),
-//         at: *at,
-//         event: TrackEventType::Controller(ControllerSetValue {
-//             controller_id: MIDI_CC_SUSTAIN_ID,
-//             value: if on { MAX_LEVEL } else { 0 },
-//         }),
-//     }
-// }
-//
-// pub fn set_damper_to(
-//     track: &mut Track,
-//     changeset: &mut Changeset,
-//     time_range: util::Range<Time>,
-//     on: bool,
-// ) {
-//     dbg!("set_damper", time_range, on);
-//     let on_before = is_cc_switch_on(cc_value_at(
-//         &track.events,
-//         &time_range.0,
-//         &MIDI_CC_SUSTAIN_ID,
-//     ));
-//     let on_after = is_cc_switch_on(cc_value_at(
-//         &track.events,
-//         &time_range.1,
-//         &MIDI_CC_SUSTAIN_ID,
-//     ));
-//
-//     clear_cc_events(track, changeset, time_range, MIDI_CC_SUSTAIN_ID);
-//
-//     if on {
-//         if !on_before {
-//             let on_ev = sustain_event(&mut track.id_seq, &time_range.0, true);
-//             changeset.add(EventAction::Insert(on_ev));
-//         }
-//         if !on_after {
-//             let off_ev = sustain_event(&mut track.id_seq, &time_range.1, false);
-//             changeset.add(EventAction::Insert(off_ev));
-//         }
-//     } else {
-//         if on_before {
-//             let off_ev = sustain_event(&mut track.id_seq, &time_range.0, false);
-//             changeset.add(EventAction::Insert(off_ev));
-//         }
-//         if on_after {
-//             let on_ev = sustain_event(&mut track.id_seq, &time_range.1, true);
-//             changeset.add(EventAction::Insert(on_ev));
-//         }
-//     }
-// }
-//
-// fn cc_value_at(events: &Vec<TrackEvent>, at: &Time, cc_id: &ControllerId) -> Level {
-//     let mut idx = events.partition_point(|x| x.at < *at);
-//     while idx > 0 {
-//         idx -= 1;
-//         if let Some(ev) = events.get(idx) {
-//             if let TrackEventType::Controller(cc) = &ev.event {
-//                 if cc.controller_id == *cc_id {
-//                     return cc.value;
-//                 }
-//             }
-//         }
-//     }
-//     return 0; // default
-// }