Python 3 fixes.
Comment out some lines which don't seem to be used anymore.
Increase some timeouts for text we are expecting.