Remove unneeded output from client and common