Removed IOC and made everything non-static