simplify code to noCascade option