Cleaned Up setup.py includes
Looking to make these more explicit and remove where not required
Hello @WillAyd! Thanks for updating this PR. We checked the lines you've touched for [PEP 8](https://www.python.org/dev/peps/pep-0008) issues, and found:



There are currently no PEP 8 issues detected in this Pull Request. Cheers! :beers: 

##### Comment last updated at 2019-12-12 18:28:45 UTC should rebase this after we merge #30112  LGTM needs rebase