Evaluation code completed and remove the validation parameter