Merge "Cleanup py27 support"