safety dance and test cleanup