Remove unnecessary cleanup step