Cleanup in build directives