Remove workarounds for Python 2.5 and earlier
Fix imports