Updated clean rules