More setup.py simplification