removing evil evil references to client