Experimental cleanup