Clean up v34.7