minor clean up for final 1.2 release