Removed old Export code
Removed old and dirty code
Removed unused function calls