Some clean-up from the squash