O_TARGET should basically be dead for non arch-specific code in 2.5
(it's still functional, though), so kill the cases where it creeped back
in.