Changed cleanup to minutes, more precise, easier to test