Version 1.2.4.1 changes - cleanup rules on disable