small directives clean-up