Final commit hopefully removing IoC old ref