Small update to handle deleting rules, renamed tracker class and file