Clean up v 1.2