new rules, cleanup