Remove code added just for python 3.x compatibility