update should module to version 3.x; clean-up validator and sanitizer code