Python 3.X cleanup