Remove hq refs - more refactoring