Cleanup setup files
Merge pull request #349 from romainneutron/setup-cleanup

[3.8] Cleanup setup files