diff --git a/oxisynth/Cargo.toml b/oxisynth/Cargo.toml
index 6abe0fa..5fe2f02 100644
--- a/oxisynth/Cargo.toml
+++ b/oxisynth/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "oxisynth"
 version = "0.0.5"
-edition = "2018"
+edition = "2021"
 
 authors = ["Poly <marynczak.bartlomiej@gmail.com>"]
 description = "Rust soundfont synthesizer"
diff --git a/oxisynth/src/core/midi.rs b/oxisynth/src/core/midi.rs
index 61055c1..546c710 100644
--- a/oxisynth/src/core/midi.rs
+++ b/oxisynth/src/core/midi.rs
@@ -1,5 +1,3 @@
-use std::convert::{TryFrom, TryInto};
-
 use crate::core::channel_pool::Channel;
 use crate::core::font_bank::FontBank;
 use crate::core::soundfont::modulator::Mod;
@@ -428,7 +426,7 @@ pub(in super::super) fn cc(
                         );
                     }
                     // TODO: This is fishy, for some reason those are missing from FluidLite, but
-                    // are pressent in Fluidsynth
+                    // are present in Fluidsynth
                     // https://github.com/FluidSynth/fluidsynth/blob/fa5173cbaefed60121db057bad7be7686165f7cc/src/synth/fluid_synth.c#L1857
 
                     // RPN_TUNING_PROGRAM_CHANGE | RPN_TUNING_BANK_SELECT | RPN_MODULATION_DEPTH_RANGE
diff --git a/oxisynth/src/core/mod.rs b/oxisynth/src/core/mod.rs
index d8215a6..ea01980 100644
--- a/oxisynth/src/core/mod.rs
+++ b/oxisynth/src/core/mod.rs
@@ -23,8 +23,6 @@ use self::channel_pool::ChannelPool;
 use self::font_bank::FontBank;
 
 use crate::{Settings, SettingsError, SynthDescriptor};
-use std::convert::TryInto;
-
 #[derive(Clone)]
 struct FxBuf {
     pub reverb: [f32; 64],
diff --git a/oxisynth/src/core/soundfont/generator.rs b/oxisynth/src/core/soundfont/generator.rs
index dd23dcc..68041ec 100644
--- a/oxisynth/src/core/soundfont/generator.rs
+++ b/oxisynth/src/core/soundfont/generator.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use super::super::Channel;
 
 macro_rules! u8_to_enum {
diff --git a/oxisynth/src/core/soundfont/instrument.rs b/oxisynth/src/core/soundfont/instrument.rs
index 6858029..4cc229d 100644
--- a/oxisynth/src/core/soundfont/instrument.rs
+++ b/oxisynth/src/core/soundfont/instrument.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom as _;
-
 use crate::GeneratorType;
 
 use super::generator::GeneratorList;
diff --git a/oxisynth/src/core/soundfont/preset.rs b/oxisynth/src/core/soundfont/preset.rs
index b09d7ac..df549f6 100644
--- a/oxisynth/src/core/soundfont/preset.rs
+++ b/oxisynth/src/core/soundfont/preset.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom as _;
-
 use super::generator::{GeneratorList, GeneratorType};
 use super::modulator::Mod;
 use super::{instrument::Instrument, Sample};
diff --git a/oxisynth/src/settings.rs b/oxisynth/src/settings.rs
index 93766d2..81668d1 100644
--- a/oxisynth/src/settings.rs
+++ b/oxisynth/src/settings.rs
@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 pub struct SynthDescriptor {
     pub reverb_active: bool,
     pub chorus_active: bool,
diff --git a/soundfont-rs/Cargo.toml b/soundfont-rs/Cargo.toml
index d66b4d2..1a2c822 100644
--- a/soundfont-rs/Cargo.toml
+++ b/soundfont-rs/Cargo.toml
@@ -2,7 +2,7 @@
 name = "soundfont"
 version = "0.1.0"
 authors = ["Poly <marynczak.bartlomiej@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 description = "sf2 file parser"
 keywords = ["sf2","soundfont"]
diff --git a/soundfont-rs/src/raw/hydra/generator.rs b/soundfont-rs/src/raw/hydra/generator.rs
index 63081b8..623bcba 100644
--- a/soundfont-rs/src/raw/hydra/generator.rs
+++ b/soundfont-rs/src/raw/hydra/generator.rs
@@ -2,7 +2,6 @@ use super::super::utils::Reader;
 use crate::error::Error;
 use crate::riff::{Chunk, ChunkId, ScratchReader};
 use crate::SfEnum;
-use std::convert::TryFrom;
 use std::io::{Read, Seek};
 
 #[derive(Debug, Clone)]
diff --git a/soundfont-rs/src/raw/hydra/modulator.rs b/soundfont-rs/src/raw/hydra/modulator.rs
index 7df9ad1..a8a5243 100644
--- a/soundfont-rs/src/raw/hydra/modulator.rs
+++ b/soundfont-rs/src/raw/hydra/modulator.rs
@@ -3,7 +3,6 @@ use crate::raw::GeneratorType;
 
 use super::super::utils::Reader;
 use crate::riff::{Chunk, ChunkId, ScratchReader};
-use std::convert::{TryFrom, TryInto};
 use std::io::{Read, Seek};
 
 #[derive(Debug, Clone, Copy, PartialEq)]
diff --git a/soundfont-rs/src/raw/utils.rs b/soundfont-rs/src/raw/utils.rs
index a44efb0..0c1c4d7 100644
--- a/soundfont-rs/src/raw/utils.rs
+++ b/soundfont-rs/src/raw/utils.rs
@@ -1,5 +1,4 @@
 use crate::error::Error;
-use std::convert::TryInto;
 
 pub(crate) struct Reader<'a> {
     data: &'a [u8],