Client is no longer passed