fix: removes deprecated code in favor of new code

[Tigatok]

Removes deprecation. I found older issues that seemed to do the same thing, and more, but I think this is all that is needed.