Remove unnecessary cleanup code