Refactoring Rule and removing CustomRule
Fixing conflicts
Removing custom rule spec