Added more cleanup to Final Section Directive