Remove redundant declarations Sort validators by lexographical order Change-Id: I9a55a55a28702bba38615bad192f6f80706eec7c