more unused directives removed