Code cleanup: validation plugins
8 files changed