Remove validator static class