Got rid of other validation