Rules clean-up