Remove some 3.x stuff not compatible with J2.5