clean up v1.37