Do we still need this now the that this function itself does not sit on the start-up path?