Add a cleanup step