remove helper method references

remove all remaining refs to helper methods