Remove duplicate code from exports
Merge pull request #404 from RavWar/fix_exports_duplicates

Remove duplicate code from exports