Removing that dependency didn't take a lot of code, and fewer
dependencies are better

This will be useful if we need to do some locking at some point. It's
just nice that the same thing is passed back every time

Right now I'm just doing loops, we we can add some batch stuff here
later

These were never needed

This should make it easier (possible) to query for expired images

I also moved over to passing borrows of the time. This should have been
a separate commit, but i forgot.