Choosed to move outdated functions to helper

As comments for now