Fix the cleanup so that we're not left with shelftemp.db.* files.

This does nothing to fix the tests though...