Patch, delete, directive cleanup