some final clean up for 3.1.0.M1