Removed bad lingering HLR dependencies