Removed unnecessary imports
Merge branch 'add_atexit'