cleaning up v1.0 branch