Removed obsolete helpers