- Revert files that will only run as python2. - Remove superfluous calls to list() - Other minor cleanup