clean up v1.31