Ripped out bad lingering dependencies from HLR