find a package, not a temp

Two items:

1. If we're looking for a package, let's say so.
2. Dead code is dead, prune the cruft.