step definition cleanup