BUG/ENH: Drop PY3K compatibility code