Added a very basic helper

And removed old equivalent and outdated functions