remove dependency to client tools