Cleaning up v2 branch