Remove py22 stuff