Remove unnecessary cleanup