clean up v1.35