clean up history, add support juju 1.17.6+