Remove a useless if condition and comment