directive cleanup