Move validation down into policy team