add validation
remove useless lines