Fix deprecations (#409)

* Fix deprecations

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>

* Got rid of unnecessary opt-in

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>

* Optimized imports

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>

---------

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>