Added new cleanup rules