clean up 1.2