3.2-RC cleanup