End of the unit management