clean up v1.40