make cleanup unnecessary by using expire
Merge pull request #971 from grosser/cleanup

make cleanup unnecessary by using expire fixes #966