Cleanup up for py26