Removed IoC from main branch