Remove hib reference
Work towards final version