Remove some dead code
Use "format" method on str instead of "%"
Add OneOf and SubSetOf validators