Remove some Python 2 constructs