cleanup improved