add cleanup task and specs