Mellen fixed missed renames. removed unused function