Removed dependency on validator.