Best way to create a collection for on-deman installs as required, but, that automatically removes clients after the install

SCCM 2007 SP2 R3.  We do "on-demand" installs by having collections setup targeted with advertisements for various products, say Adobe Acrobat Pro, and when we get a request, we manually drop the client into the collection and the install starts in a few minutes.

Problem is...some staff forget to remove the old clients from the collections.

Can a query be setup to automatically remove the client from the collection post-install, when the collection refreshes?  Problem we are seeing is that whether we use a query for HAVING or for NOT HAVING the product, it then brings in all the other computers that don't have the product...

Any way to do this, or, we have to continue to manually remove post-install?

Thanks!