rename a function in order, stop exposing it
remove an unused where clause