Improve phpdoc Validation trait
Remove expiration stuff for now