Updated setup.py and removed old import