Remove cmdargs dependency