Revert "cleanup time, everyone do their share"

This reverts commit e92d8ea6df62b475fa0fd13c64d131be07573f89.