less strict cleanup