Corrected cleanup