removed unused wrapper
removed unused id + format
refactoring rules
more rules