cleanup tasks that should cover #9