2.0-RC2 cleanup