More cleanup of getTargetSGP