K3.0/J3.0/J2.5 Backend: Some cleanup.