removed some obsolete functions