IMP code clean