remove more Python 3-incompatible things