Add a little bit more cleanup on deletes.