SA scraps plan to lift all border measures