Directive clean up