opt cleanup