clean up v1.1