Remove isValid() function