remove dependency to client