MB: cleanup directives