7/16 moved validation rule generator to separate service