Remove some dead code and steps towards making python3 happy