Remove unnecessary setting of flag