2nd cleanup attempt