Re-add tmp/package removal