added scheduled cleanup