Correct the setup.py script and undo some wrong changes