RC2 cleanup