Core/SAI: drop unneeded code