First changes to remove handles from the client side.