IMC cleanup