Removed leftover clienthandle code