Fix main data import command.
Remove problematic code every time we write a figure to file