Simplify script to avoid useless recalls