Remove pre 3.0 temp code