[squashme] Further simplication