removed useless function wrapper
thoughts on next directions