Remove State validation