clean up v 2.0