[4.2] Remote : remove double if