Removed log messages
Fixed import/export flow