add export manager to move some logic
remove useless statement
Merge pull request #608 from arnaudbey/exportmanager

Exportmanager