make cleanup unnecessary by using expire fixes #966