Refactor helper to remove deprecated method