remove more of ClientSystem