Removing client passing