[IMP-dev] unit cleanup