clean up v1.36