Wrap expiration in a transaction

Also remove a couple indexes that we shouldn't need.