Removed references to validator, fixed paths