split orphan cleanup task in two