Fix removal of softwareunits