Fix `remove' target for some of the packages
Merge pull request #2407 from samoht/master

Fix `remove' target for some of the packages