IOC code cleanup