[squash] cleanup