More idempotent delete route

Conflicts:
	cluster/aws/util.sh