had accidentally left some obsolete function arguments