Remove some not-needed lines.
Merge topic 'fix-export-segfault' into next

5078ed8 Remove some not-needed lines.