Directive cleanup