Cleanup of setup.py