Removed calls to obsolete functions