Found a few more little 4G dangleberries

Change-Id: I10bcfbd26c3a8b51638da02af7707014cd091d34