Use existing methods from helper class, removing obsolete ones.