clean up for 1.2