removed some obsolete function calls