Add validate
Remove unnessesary code