Remove some more unused directives