s: issue #15 removing specific functions from top level