various cleanup to sections