make cleanup unnecessary by using expire fixes #966

@mperham #966