Fix cleanup process of several packages