Fixes to the package removal