removed useless if