Removed dead code
Added type hint
Removed unused use statements
Removed todo