Cleaning up logging/IOC