Add deleting rules and remove extra notify