IOC refactor cleanup