[IM] More code cleaning