removing useless if check